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

guoyuji

2024-06-25 8668e5ce64e1d7b3dbfffc42cf6767cb9ea2d6c0

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

@@ -93,5 +93,7 @@

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

    List<Order> getPrintCustomData(String orderId, Integer orderNumber);
    List<Order> getPrintCustomData(String processId, Integer technologyNumber);

    Integer getPrintLabelCount(String processId, Integer technologyNumber);
}