From ea5e88b0c6f5be4d0c6637b5e7bba94ee85f9673 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 26 五月 2023 08:58:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6
---
src/main/java/com/zy/asrs/controller/BasSteErrLogController.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java b/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java
index b745411..eba925b 100644
--- a/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java
+++ b/src/main/java/com/zy/asrs/controller/BasSteErrLogController.java
@@ -15,10 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
public class BasSteErrLogController extends BaseController {
@@ -41,6 +38,7 @@
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
EntityWrapper<BasSteErrLog> wrapper = new EntityWrapper<>();
+ wrapper.orderBy("start_time",false);
excludeTrash(param);
convert(param, wrapper);
allLike(BasSteErrLog.class, param.keySet(), wrapper, condition);
--
Gitblit v1.9.1