From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/controller/BasLiftOptController.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasLiftOptController.java b/src/main/java/com/zy/asrs/controller/BasLiftOptController.java
index dcddbf2..5d1c099 100644
--- a/src/main/java/com/zy/asrs/controller/BasLiftOptController.java
+++ b/src/main/java/com/zy/asrs/controller/BasLiftOptController.java
@@ -42,6 +42,7 @@
excludeTrash(param);
convert(param, wrapper);
allLike(BasLiftOpt.class, param.keySet(), wrapper, condition);
+ wrapper.orderBy("send_time", false);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(basLiftOptService.selectPage(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1