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

chenlu

2024-08-23 091e7f6c7c22e327796f1bee9d882881ebc81a3a

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

@@ -169,4 +169,8 @@
    List<Map<String, Object>> remakList(String processId);

    List<Map<String, Object>> selectMaxFlowCard(String orderId, String productionId);

    List<Map<String, Object>> selectFlowCardMerge(String processId);

    Boolean updateFlowCardMerge(String processId);
}