From 534acb09313afcb005543ab83028985a7075eeef Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 03 四月 2025 10:28:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
index abf30a2..305a22a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBillService.java
@@ -87,7 +87,7 @@
Boolean cashPay(CachPayDto offlinePayDto);
- BillStatisticsDto statistics();
+ BillStatisticsDto statistics(String busdeptId);
Integer batchBillCount(String userId, List<String> billIds);
@@ -95,5 +95,5 @@
* 查询街道租金排行
* @return
*/
- List<ScreenRentRankVO> getStreetRentRank();
+ List<ScreenRentRankVO> getStreetRentRank(String businessDeptId);
}
--
Gitblit v1.7.1