Merge remote-tracking branch 'origin/dev' into dev

src/main/resources/mapper/schedule/TodayScheduleMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xjrsoft.module.room.mapper.TodayScheduleMapper">
+<mapper namespace="com.xjrsoft.module.schedule.mapper.TodayScheduleMapper">
     <select id="getList" parameterType="com.xjrsoft.module.schedule.dto.TodaySchedulePageDto" resultType="com.xjrsoft.module.schedule.vo.TodayScheduleVo">
-        SELECT * FROM today_schedule WHERE FIND_IN_SET(#{dto.userId}, user_id) ORDER BY t1.start_time
+        SELECT * FROM today_schedule WHERE FIND_IN_SET(#{dto.userId}, user_id) ORDER BY start_time
     </select>
 </mapper>