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

guoyuji

2024-10-14 e6bf567a863fb8a6bc7b776ac938825111c9ab52

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

@@ -94,4 +94,6 @@
    List<Map<String,String>> getSelectProcessJiajiao();

    List<Map<String,String>> getSelectProcessDuoqu();

    List<Map<String, String>> SelectReworlDetailMpReview(String processIdStr, String technologyStr, String process, String previousProcess);
}