Merge remote-tracking branch 'origin/api' into api

935090232@qq.com

2021-01-15 19fb7fa1fdbcee7cecfee1554610bb40f40e2976

 zq-erp/src/main/resources/mybatis/mapper/hive/SysBeauticianStateDao.xml

@@ -327,6 +327,8 @@
       <![CDATA[ a.BEGIN_TIME > #{beginTime}
        and a.END_TIME < #{endTime}
        and a.STAFF_ID = #{suId} ]]>
        and  a.STATE !='预约取消'
        and  a.STATE !='待确认'
        order by a.BEGIN_TIME asc

    </select>