From 19dc607fe5fd18531d6deaa4fe8540b602585723 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Wed, 27 Jan 2021 09:12:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hive2.0' into hive2.0
---
zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml | 3 ++-
1 files changed, 2 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 a6fd1d8..7a5a0e5 100644
--- a/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
+++ b/zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml
@@ -329,6 +329,7 @@
and a.STAFF_ID = #{suId} ]]>
and a.STATE !='预约取消'
and a.STATE !='待确认'
+ and a.STATE !='待预约'
order by a.BEGIN_TIME asc
</select>
@@ -457,7 +458,7 @@
</if>
<if test="cateId != null and cateId != '' ">
- and c.PROJ_TYPE_ID=#{cateId}
+ and c.cate_id=#{cateId}
</if>
--
Gitblit v1.9.1