Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

 src/main/java/org/springblade/modules/machining/mapper/MachiningMapper.java

@@ -38,5 +38,6 @@
    * @return
    */
   List<MachiningVO> selectMachiningPage(IPage page, MachiningVO machining);
   List selectInfo();

}