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

廖井涛

2024-07-11 0fc373456bdc51d83ca520d05693f5031bfce9d8

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

@@ -113,4 +113,6 @@
    Boolean printOrderSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);

    List<Map<String, String>> getPrimaryListMerge(String processId, String technologyNumber);

    List<Map<String, String>> selectorderOtherMoney();
}