From cf487b4baf05048e8929b47d73efc83d6a09162c Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 30 一月 2024 17:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityRegisteredService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityRegisteredService.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityRegisteredService.java
index 222d297..a69e0ca 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityRegisteredService.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/IUserActivityRegisteredService.java
@@ -15,6 +15,6 @@
* @return
* @throws Exception
*/
- List<Map<String, Object>> query(Integer companyId) throws Exception;
+ List<Map<String, Object>> query(Integer language, Integer companyId) throws Exception;
}
--
Gitblit v1.7.1