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

Helius

2021-01-15 d8d88d8f5e3c333fa79f76b46d43b21d130b2322

 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>