From 581835e407eab022616b4a62377ea5e4ae9ba346 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 19 Oct 2022 14:47:38 +0800
Subject: [PATCH] Merge branch 'score_shop'

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

diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/MyBeauticianCountDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/MyBeauticianCountDao.xml
index 6819621..b55a131 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/MyBeauticianCountDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/MyBeauticianCountDao.xml
@@ -32,7 +32,7 @@
 				LEFT JOIN sys_proj_services b ON a.SERVICES_ID = b.ID
 				LEFT JOIN sys_vip_info c ON b.VIP_ID = c.ID
 				LEFT JOIN sys_users d on d.su_id=a.STAFF_ID
-		    WHERE b.state='服务单结束' and (c.IS_DELETE is null or c.IS_DELETE = '')
+		    WHERE b.state='服务单结束'
 			) t
 		GROUP BY
 			t.VIP_ID,

--
Gitblit v1.9.1