Merge branch 'api' into order_reform

wzy

2021-01-13 1a6bfc97c0acfbb386f4e06f6d0a4558c305d994

Merge branch 'api' into order_reform

 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>

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

@@ -395,7 +395,7 @@
        </where>



        order by a.create_time desc


          limit ${offset},${limit}