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

guoyujie

1 天以前 748e47eb02e874e521500b24f5444d6dbaeda3b8

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

@@ -120,7 +120,7 @@

    Integer getPrintLabelCount(String processId, String technologyNumber);

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

    List<Map<String, Object>> getRepairPrintCustomData(String processId, String technologyNumber, String reportingWorkId, Integer orderNumber);