Merge remote-tracking branch 'origin/master'

zengh

2022-07-19 ec09030f0730809145c97bfaa0bd0387a7d990bf

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

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

}