From 736ab0090700c75af37b8a3456b01609e4e2d329 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 17 七月 2024 11:09:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java
index 321cf1d..4cb2f30 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/AgreementServiceImpl.java
@@ -24,10 +24,10 @@
* @throws Exception
*/
@Override
- public String queryByType(Integer type) throws Exception {
- String s = agreementMapper.queryByType(type, 2);
+ public String queryByType(Integer type, Integer language) throws Exception {
+ String s = agreementMapper.queryByType(language, type, 2);
if(ToolUtil.isEmpty(s)){
- s = agreementMapper.queryByType(type, null);
+ s = agreementMapper.queryByType(language, type, null);
}
return s;
}
--
Gitblit v1.7.1