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

guoyuji

2024-09-06 a1f44a778cc00f57a2ec9dd7a1bfa79c777db237

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

@@ -80,4 +80,6 @@
    Boolean ReviewReportingWorkMp(String substring, String process, String result, String userName);

    String getPatchConditionMp(String reportingWorkId);

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