Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan

zouyu

8 天以前 09394848ce262aff81897503d32ec334fd3f2b6f

 src/main/java/com/ruoyi/production/controller/ProductionOrderController.java

@@ -37,7 +37,7 @@
    @Log(title = "生产订单-分页查询", businessType = BusinessType.OTHER)
    @ApiOperation("生产订单-分页查询")
    public AjaxResult listPage(Page page, ProductionOrder productionOrder) {
        return AjaxResult.success(productionOrderService.listPage(page, productionOrder));
        return productionOrderService.listPage(page, productionOrder);
    }

    @PostMapping("/addProductionOrder")