From 7e45c420dd19a3ffe224e9cd42bf7ea31277d7be Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 27 五月 2022 16:48:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jkasrs' into jkasrs
---
src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
index 669978a..d635718 100644
--- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java
@@ -51,7 +51,7 @@
}
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
}else {
- wrapper.orderBy("modi_time", false).orderBy("wrk_no", false);
+ wrapper.orderBy("modi_time", false);
}
return R.ok(wrkMastLogService.selectPage(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1