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

chenlu

2024-08-20 2b49c5d247ca32b5aaa47e50749f8b17efa3f408

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