Merge remote-tracking branch 'origin/score_shop' into developer

935090232@qq.com

2022-04-24 14f20daccada2ebe169a45a326e13f4744683716

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

@@ -334,6 +334,7 @@
        and  a.STATE !='预约取消'
        and  a.STATE !='待确认'
        and  a.STATE !='待预约'
        and  a.STATE !='服务单结束'
        order by a.BEGIN_TIME asc

    </select>