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

guoyuji

2024-06-25 f94dec7ddbd0aa96f642f04d41d0f74ca0edfdc7

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

@@ -95,7 +95,7 @@

    List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);

    List<Order> getPrintCustomData(String processId, Integer technologyNumber);
    List<Map<String, Object>>  getPrintCustomData(String processId, Integer technologyNumber);

    Integer getPrintLabelCount(String processId, Integer technologyNumber);
}