From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/acct/ShopVipAccountServiceDaoImplMapper.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/acct/ShopVipAccountServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/acct/ShopVipAccountServiceDaoImplMapper.xml
index 6003566..6cc066c 100644
--- a/java110-db/src/main/resources/mapper/acct/ShopVipAccountServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/acct/ShopVipAccountServiceDaoImplMapper.xml
@@ -70,9 +70,7 @@
         <if test="acctType !=null and acctType != ''">
             , t.acct_type= #{acctType}
         </if>
-        <if test="shopId !=null and shopId != ''">
-            , t.shop_id= #{shopId}
-        </if>
+
         <if test="acctName !=null and acctName != ''">
             , t.acct_name= #{acctName}
         </if>
@@ -83,6 +81,9 @@
         <if test="vipAcctId !=null and vipAcctId != ''">
             and t.vip_acct_id= #{vipAcctId}
         </if>
+        <if test="shopId !=null and shopId != ''">
+            and t.shop_id= #{shopId}
+        </if>
 
     </update>
 

--
Gitblit v1.8.0