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

chenlu

2024-08-15 b1c49ce18f24c7cf89c2b938f2737dba611d30ee

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

@@ -24,7 +24,7 @@

    List<Map<String,String>> SelectTechnologicalNumMp(String processIdStr, String technologyStr, String process, String reportType);

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

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