From c51ab886ca899243f36cffe6c1a86d19057d44f5 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:18:38 +0800
Subject: [PATCH] 合并代码，解决冲突
---
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