Merge branch 'api' into hive2.0

935090232@qq.com

2021-01-26 d622f4d59d6b9e03271b3f4774bffedb3b8a3078

 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>