From 06346cdbdebfd83750aceb879664b72f0484cab0 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期三, 17 八月 2022 16:48:02 +0800
Subject: [PATCH] Merge branch 'gzynasrs' of http://47.97.1.152:5880/r/zy-asrs into gzynasrs
---
src/main/java/com/zy/asrs/controller/TestMastController.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TestMastController.java b/src/main/java/com/zy/asrs/controller/TestMastController.java
index 8560f44..485e7ab 100644
--- a/src/main/java/com/zy/asrs/controller/TestMastController.java
+++ b/src/main/java/com/zy/asrs/controller/TestMastController.java
@@ -40,6 +40,8 @@
EntityWrapper<TestMast> wrapper = new EntityWrapper<>();
excludeTrash(param);
convert(param, wrapper);
+ orderByField="status";
+ orderByType="asc";
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(testMastService.selectPage(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1