Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-09-06 d809ecd16cbb23f5aad86a6844f51ffea0455fe8

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

@@ -77,7 +77,9 @@

    Integer selectLayerByReportingWorkId(String reportingWorkId);

    Boolean ReviewReportingWorkMp(String substring, String process, String result);
    Boolean ReviewReportingWorkMp(String substring, String process, String result, String userName);

    String getPatchConditionMp(String reportingWorkId);

    Integer getFirstStep(String processId, String orderSort, Integer technologyNumber, String interceptProcess);
}