From 8dd61e711d7cccd7d8d1278ab79a73e7a41aad4d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 01 二月 2024 08:50:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityBalanceService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityBalanceService.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityBalanceService.java
index 4946e5a..fb4db56 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityBalanceService.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityBalanceService.java
@@ -15,5 +15,5 @@
      * @return
      * @throws Exception
      */
-    List<Map<String, Object>> query(Double money, Integer companyId) throws Exception;
+    List<Map<String, Object>> query(Integer language, Double money, Integer companyId) throws Exception;
 }

--
Gitblit v1.7.1