Merge remote-tracking branch 'origin/master'

wu

2024-08-22 cbec6e3f120344f6f2d69808aaabb447bb52a693

 hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java

@@ -42,7 +42,6 @@
                //.eq("this_process", reportingdamage.getThisProcess())
                //.eq("device_name",reportingdamage.getDeviceName())
                .ge("reporting_work_time", reportingdamage.getReportingWorkTime())
                .le("reporting_work_time",reportingdamage.getReportingWorkTime2())
                .groupBy("this_process");
        return reportingDamageMapper.selectList(queryWrapper);
    }