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

廖井涛

2024-11-11 8f7c5b48419ee7fb720f9c23884b86d09f1522f0

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

@@ -163,7 +163,7 @@

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

    List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber);
    List<Map<String, Object>> getPrintCustomDataDetails(String processId, Integer orderNumber, Integer printQuantity);

    List<Map<String, Object>> getPrintCustomDataProjectNo(String projectNo);