From 96eda9af2046e59fe3bc991f945682774b34e05c Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 12 Apr 2021 15:38:40 +0800 Subject: [PATCH] Merge branch 'data_move' of http://120.27.238.55:7000/r/beauty-erp into data_move --- zq-erp/src/main/resources/mybatis/mapper/hive/SysBedStateDao.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBedStateDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBedStateDao.xml index e78e21d..656a1a4 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBedStateDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBedStateDao.xml @@ -214,9 +214,9 @@ <if test="record.serviceId != null and record.serviceId !='' "> and a.SERVICE_ID = #{record.serviceId} </if> - <if test="record.bedInfo != null and record.bedInfo.shopId !=null "> - and b.SHOP_ID = #{record.bedInfo.shopId} - </if> +<!-- <if test="record.bedInfo != null and record.bedInfo.shopId !=null ">--> +<!-- and b.SHOP_ID = #{record.bedInfo.shopId}--> +<!-- </if> --> </if> </sql> </mapper> \ No newline at end of file -- Gitblit v1.9.1