Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

huang

2024-11-26 45f64d8b130c57ff2b8e8442d65ab7a490e915e3

 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;