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

guoyuji

2024-12-03 68d7be0814e89ef811c2e7c435dff7af64ea60c1

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

@@ -188,4 +188,6 @@
    List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);

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

    List<Map<String, String>> getPrintLabel3(String projectNo);
}