From c41e8d372cdabbe1fd5973c9322e38a40bfa1a39 Mon Sep 17 00:00:00 2001
From: 姜友瑶 <935090232@qq.com>
Date: Thu, 05 May 2022 15:50:07 +0800
Subject: [PATCH] Merge branch 'developer' into alpha
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 1 +
1 files changed, 1 insertions(+), 0 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 709e6c9..dd72e3c 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
@@ -334,6 +334,7 @@
and a.STATE !='预约取消'
and a.STATE !='待确认'
and a.STATE !='待预约'
+ and a.STATE !='服务单结束'
order by a.BEGIN_TIME asc
</select>
--
Gitblit v1.9.1