From 5d7b0a0bbcae6844e2296ef53c3f4c88293dacfe Mon Sep 17 00:00:00 2001
From: jinquanOu <1511349576@qq.com>
Date: 星期二, 11 六月 2024 18:18:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
index fa3cbc6..d728150 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/TravelCountServiceImpl.java
@@ -9,6 +9,7 @@
 import com.ruoyi.common.utils.MapUtils;
 import com.ruoyi.domain.TravelCount;
 import com.ruoyi.domain.TravelDetail;
+import com.ruoyi.domain.ZfProperty;
 import com.ruoyi.mapper.TravelCountMapper;
 import com.ruoyi.service.TravelCountService;
 import com.ruoyi.service.TravelDetailService;
@@ -58,6 +59,7 @@
         if(happenEndTime!=null){
             lqw.lt(TravelCount::getEndTime,happenEndTime);
         }
+        lqw.orderByDesc(TravelCount::getCreateTime);
 
         Page<TravelCount> resultPage = page(new Page<>(pageNum, pageSize), lqw);
         resultPage.getRecords().forEach(this::inputTotalData);

--
Gitblit v1.9.1