From 021640e69b32dbd9b88a538402671c47f280df9e Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期三, 31 一月 2024 15:50:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev

---
 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