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

zouyu

2 天以前 c43ec56912aa1a5a711dc31c059324e43061964c

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

 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")