From 99091a8cbb8e098575c75a7c640b568addbcc29d Mon Sep 17 00:00:00 2001 From: wzy <wzy19931122ai@163.com> Date: Sun, 09 Oct 2022 21:41:13 +0800 Subject: [PATCH] Merge branch 'score_shop' --- 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..31b0dfe 100644 --- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml +++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml @@ -333,6 +333,7 @@ and a.STAFF_ID = #{suId} ]]> and a.STATE !='预约取消' and a.STATE !='待确认' + and a.STATE !='服务单结束' and a.STATE !='待预约' order by a.BEGIN_TIME asc -- Gitblit v1.9.1