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

src/main/java/com/xjrsoft/module/classtime/controller/ClassTimeCalendarController.java

@@ -53,7 +53,7 @@ public class ClassTimeCalendarController {
 
         LambdaQueryWrapper<ClassTimeCalendar> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper
-                    .orderByDesc(ClassTimeCalendar::getId)
+                    .orderByDesc(ClassTimeCalendar::getCreateDate)
                 .select(ClassTimeCalendar.class,x -> VoToColumnUtil.fieldsToColumns(ClassTimeCalendarPageVo.class).contains(x.getProperty()));
         IPage<ClassTimeCalendar> page = classTimeCalendarService.page(ConventPage.getPage(dto), queryWrapper);
         PageOutput<ClassTimeCalendarPageVo> pageOutput = ConventPage.getPageOutput(page, ClassTimeCalendarPageVo.class);

src/main/resources/mapper/classtime/ClassTimeDeleteMapper.xml

@@ -19,6 +19,7 @@
         <if test="dto.enabledMark != null">
             and t1.status = #{dto.enabledMark}
         </if>
+         order by t1.create_date desc
     </select>
 
 </mapper>