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

guoyuji

2024-07-02 1558c2fa4a3a1479d53977a4b46c1dda18192243

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

@@ -84,6 +84,8 @@

    List<Map<String, String>> getPrintLabel(String projectNo);

    List<Map<String, String>> getPrintLabel1(String processId,Integer technologyNumber);

    List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, FlowCard flowCard);

    Boolean printSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);