From 4901728f970314cddd9fa167cf3d3fb9476208e5 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sxjzasrs' into sxjzasrs
---
src/main/java/com/zy/asrs/controller/StaDescController.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/StaDescController.java b/src/main/java/com/zy/asrs/controller/StaDescController.java
index 8d85caf..26e5569 100644
--- a/src/main/java/com/zy/asrs/controller/StaDescController.java
+++ b/src/main/java/com/zy/asrs/controller/StaDescController.java
@@ -39,6 +39,7 @@
@RequestParam Map<String, Object> param){
excludeTrash(param);
EntityWrapper<StaDesc> wrapper = new EntityWrapper<>();
+ wrapper.orderBy("type_no",true);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
return R.ok(staDescService.selectPage(new Page<>(curr, limit), wrapper));
--
Gitblit v1.9.1