Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

4 天以前 dbd7fd484b5c7ed00cb895f227645848c3677c08

 src/main/java/com/ruoyi/production/service/ProductionOrderService.java

@@ -32,7 +32,7 @@

    List<ProductionOrderPickVo> pick(Long productionOrderId);

    ProductionOrderWorkOrderDetailVo getWorkOrderReportInspectDetail(Long productionOrderId);
    ProductionOrderWorkOrderDetailVo getWorkOrderReportInspectDetail(ProductionOrderDto productionOrderDto);

    int updateOrder(ProductionOrderDto productionOrderDto);
}