Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

wzy

2021-01-26 c42165204bda966c32f6c5e6cba7a978e08922e7

 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>