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

guoyujie

3 天以前 3d9e0ec1c1e457ed3fd2b334cf4c4dd66c10eead

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

@@ -30,5 +30,7 @@

    Map<String, Integer> getOkPageTotal(Integer offset, Integer pageSize, String selectTime1, String selectTime2, String orderId, String processes, ProductionScheduling productionScheduling);

    Boolean cancelReviewSchedulingMp(String schedulingId);

//    Integer selectNumberMp(String orderId, String orderNumber, String processes);
}