Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

zss

15 小时以前 e0c8edd1d949fae5883a60019d02a9c5f7cb7a29

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

@@ -30,7 +30,7 @@

    @ApiOperation("分页查询")
    @GetMapping("page")
    public R page(ProductOrderDto productOrder, Page page) {
    public R page(ProductOrderDto productOrder, Page<ProductOrder> page) {
        return R.ok(productOrderService.pageProductOrder(page, productOrder));
    }