Merge remote-tracking branch 'origin/feature/订单服务单代码改造' into alpha

姜友瑶

2022-06-09 824691c5f2e538fd83e75701f0c436ff5f4d8d2b

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

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