From 986e2fd11b5c0c22766ebe3f9b5f39a6fa4d8c9f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 26 May 2022 11:33:14 +0800
Subject: [PATCH] Merge branch 'feature/订单服务单代码改造' into alpha

---
 zq-erp/src/main/resources/mybatis/mapper/hive/ServicesFlowDao.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/ServicesFlowDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/ServicesFlowDao.xml
index 4782953..92bb717 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/ServicesFlowDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/ServicesFlowDao.xml
@@ -171,7 +171,7 @@
 				and a.operation_id  = #{record.operationId} 
 			</if>
 			<if test="record.shopId != null and record.shopId !='' ">
-			    AND b.VIP_ID IN (SELECT t.ID FROM sys_vip_info t WHERE t.shop_id = #{record.shopId})
+			    AND b.VIP_ID IN (SELECT t.ID FROM sys_vip_info t WHERE t.shop_id = #{record.shopId}  )
 			</if>
 			<if test="record.shopId != null and record.shopId !='' ">
 					AND b.shop_id = #{record.shopId}
@@ -257,7 +257,7 @@
 				and a.operation_id  = #{record.operationId} 
 			</if>
 			<if test="record.shopId != null and record.shopId !='' ">
-			    AND b.VIP_ID IN (SELECT t.ID FROM sys_vip_info t WHERE t.shop_id = #{record.shopId})
+			    AND b.VIP_ID IN (SELECT t.ID FROM sys_vip_info t WHERE t.shop_id = #{record.shopId}  )
 			</if>
 			<if test="record.searchShop != null and record.searchShop !=''">
 					AND b.shop_id = #{record.searchShop}

--
Gitblit v1.9.1