Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-06-09 2c98be64470f8298d3083ce337b0ffb948bee5f7

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/ReportingWorkMapper.java

@@ -101,7 +101,7 @@

    String selectOrderid(String processIdStr);

    Map<String,Float> getFootSum(Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);
    Map<String,Float> getFootSum(Integer offset, Integer pageSize, Date selectTime1, Date selectTime2, String orderId, ReportingWork reportingWork);

    Integer selectReviewedState(String reportingWorkId);