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

guoyujie

2025-07-14 16bbf8260110e2790f304e8421cf7591837ca302

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

@@ -159,7 +159,7 @@

    List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);

    List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process);
    List<Map<String, Object>> getPrintCustomDataSemi(String processId, String technologyNumber, String process, Integer orderNumber);

    List<Map<String, String>> selectPrintNotMp(String orderId);