Merge branch 'developer'

姜友瑶

2022-05-30 d7b7ccaac1d84ecd1934eab97c0fef57bd2a847d

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

@@ -333,8 +333,8 @@
        and a.STAFF_ID = #{suId} ]]>
        and  a.STATE !='预约取消'
        and  a.STATE !='待确认'
        and  a.STATE !='待预约'
        and  a.STATE !='服务单结束'
        and  a.STATE !='待预约'
        order by a.BEGIN_TIME asc

    </select>