From f18b35727a11a5f8b5e326f6045f49b571954ba3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 09 六月 2025 11:02:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeService.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeService.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeService.java
index ffb61d9..62ef124 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeService.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mongodb/service/AcquisitionBillingModeService.java
@@ -4,6 +4,7 @@
 import com.ruoyi.integration.api.model.AcquisitionBillingModeReply;
 import com.ruoyi.jianguan.mongodb.base.BaseService;
 
+import java.util.Date;
 import java.util.List;
 
 public interface AcquisitionBillingModeService extends BaseService<AcquisitionBillingMode> {
@@ -14,6 +15,6 @@
      * @param endTime 结束时间
      * @return
      */
-    List<AcquisitionBillingMode> getRangeTimeData(String startTime, String endTime);
+    List<AcquisitionBillingMode> getRangeTimeData(Date startTime, Date endTime);
 
 }

--
Gitblit v1.7.1