From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/zhang-content/src/main/java/com/ruoyi/service/TravelCountService.java b/zhang-content/src/main/java/com/ruoyi/service/TravelCountService.java
index 96f540b..fa91351 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/TravelCountService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/TravelCountService.java
@@ -19,7 +19,7 @@
  */
 public interface TravelCountService extends IService<TravelCount> {
 
-    AjaxResult selectDataList(Long userId, Integer pageNum, Integer pageSize, TravelCount travelCount, @JsonFormat(pattern = "yyyy-MM-dd") Date happenStartTime, @JsonFormat(pattern = "yyyy-MM-dd") Date happenEndTime);
+    AjaxResult selectDataList(Long userId, Integer pageNum, Integer pageSize, TravelCount travelCount, String happenStartTime, String happenEndTime);
 
     void removeData(List<Long> list);
 

--
Gitblit v1.9.1