From 6e35192ad8eb1f93a831fc6888e874344ecfd4eb Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Mon, 13 Jun 2022 16:29:57 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
index 977ec03..31b0dfe 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
@@ -334,7 +334,7 @@
and a.STATE !='预约取消'
and a.STATE !='待确认'
and a.STATE !='服务单结束'
- and a.STATE !='待预约' and (c.IS_DELETE is null or c.IS_DELETE = '')
+ and a.STATE !='待预约'
order by a.BEGIN_TIME asc
</select>
--
Gitblit v1.9.1