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

zc

2024-09-06 4d4a869fef836b96968eac9554b91604127076ca

 src/main/java/com/zy/asrs/controller/OrderDetlController.java

@@ -46,7 +46,8 @@
            wrapper.orderBy("create_time", false);
        }
        wrapper.eq("status", 1);
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
        Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(orderDetlPage);
    }

    @RequestMapping(value = "/orderDetl/pakout/list/auth")