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

guoyuji

2024-07-16 098dadcc34468f9fe37ffca45a55821d8d57fae8

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

@@ -117,4 +117,6 @@
    List<Map<String, String>> selectorderOtherMoney();

    List<Map<String, String>> selectReworkPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);

    List<Map<String, Object>> getDetailListLike(String processId, String technologyNumber);
}