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

chenlu

2024-08-22 b85a2ab202e1da68ca1e532a783dc0f5685dad3b

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

@@ -130,7 +130,7 @@

    List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);

    List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber);
    List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);

    List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);