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

廖井涛

2024-08-02 942e7424d32c912e800fbb2e58a4c206467d8941

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

@@ -139,4 +139,6 @@
    List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber);

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

    List<Map<String, String>> selectPrintNotMergeMp(String orderId);
}