From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001 From: zyx <zyx123456> Date: 星期一, 25 十二月 2023 10:23:08 +0800 Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1 --- src/main/java/com/zy/asrs/controller/BasShuttleOptController.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/BasShuttleOptController.java b/src/main/java/com/zy/asrs/controller/BasShuttleOptController.java index 5ff1f1a..44df081 100644 --- a/src/main/java/com/zy/asrs/controller/BasShuttleOptController.java +++ b/src/main/java/com/zy/asrs/controller/BasShuttleOptController.java @@ -31,6 +31,7 @@ excludeTrash(param); convert(param, wrapper); allLike(BasShuttleOpt.class, param.keySet(), wrapper, condition); + wrapper.orderBy("send_time", false); if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} return R.ok(basShuttleOptService.selectPage(new Page<>(curr, limit), wrapper)); } -- Gitblit v1.9.1