From a1844a7fc934ca943db810b1bd2a450f948607cd Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期四, 03 六月 2021 14:23:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htasrs0' into htasrs0

---
 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