From e4c065d96a605cd8f60103b31dfbe4d1fe34aae8 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 11 七月 2025 08:38:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/srjtasrs' into srjtasrs
---
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index 1c3cd11..9b2e3d5 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/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")
--
Gitblit v1.9.1