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

guoyuji

2024-08-26 d3dfcd3e96cb0f2b04cfe973e4f348ee5fe96032

 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);
}