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

guoyuji

2024-10-12 b6a4013c6a8804fe0dbaab99cf86dfa8e3d55af5

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

@@ -179,7 +179,11 @@

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

    Boolean updateFlowCardMerge(String processId);
    Boolean updateFlowCardMerge(String processId,List<Integer> technologyNumbers,Integer index);

    Boolean deleteflowCardSort(String orderId, String processId);

    List<Map<String, Object>> getPrintProjectDetailsMp(String projectNo);

    List<Map<String, Object>> getPrintCustomDataProjectDetail(String projectNo, String stockId);
}