From f96c2adc8d6bab6a4ee67a50ecfc9e6c7e435efd Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 24 四月 2023 08:50:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/stasrs' into stasrs
---
src/main/java/com/zy/asrs/controller/ManLocDetlController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
index 61e94e1..2773e4e 100644
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
@@ -55,7 +55,8 @@
param.remove("update_time");
}
}
- return R.ok(manLocDetlService.getPage(toPage(curr, limit, param, ManLocDetl.class)));
+ Page<ManLocDetl> page = manLocDetlService.getPage(toPage(curr, limit, param, ManLocDetl.class));
+ return R.ok(page);
}
@@ -110,4 +111,6 @@
}
+
+
}
--
Gitblit v1.9.1