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

guoyujie

2 天以前 58b8a2ef7bb9d50ab8d66ae0048156cafb684a15

 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);
}