Merge branch 'feature/订单服务单代码改造' into alpha

Helius

2022-05-26 986e2fd11b5c0c22766ebe3f9b5f39a6fa4d8c9f

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

@@ -334,7 +334,7 @@
        and  a.STATE !='预约取消'
        and  a.STATE !='待确认'
        and  a.STATE !='服务单结束'
        and  a.STATE !='待预约' and (c.IS_DELETE is null or c.IS_DELETE = '')
        and  a.STATE !='待预约'
        order by a.BEGIN_TIME asc

    </select>