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/service/pp/FlowCardService.java

@@ -382,6 +382,8 @@
            map.put("data", flowCardMapper.getPrintLabel(projectNo));
        } else if (Objects.equals(type, "2")) {
            map.put("data", flowCardMapper.getPrintLabel2(projectNo));
        } else if (Objects.equals(type, "3")) {
            map.put("data", flowCardMapper.getPrintLabel3(projectNo));
        }

        return map;