From c45d612c0673c5037a12b4a7514b5c52e7ecdbe9 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 26 十一月 2024 11:14:03 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
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