From c423224dbe37ea69c1a36c696f85490343e68c4c Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Tue, 09 Aug 2022 09:11:51 +0800
Subject: [PATCH] Merge branch 'developer'
---
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