Merge branch 'dev-v5.2' into dev

zhongzheng-system/src/main/java/com/zhongzheng/modules/base/service/impl/ActivityAdvertisingServiceImpl.java

@@ -48,7 +48,7 @@ public class ActivityAdvertisingServiceImpl extends ServiceImpl<ActivityAdvertis
         lqw.eq(StrUtil.isNotBlank(bo.getRemarks()), ActivityAdvertising::getRemarks, bo.getRemarks());
         lqw.in(bo.getStatus() != null, ActivityAdvertising::getStatus, bo.getStatus());
         lqw.eq(bo.getJumpType() != null, ActivityAdvertising::getJumpType, bo.getJumpType());
-        lqw.orderByAsc(bo.getSort() != null, ActivityAdvertising::getSort);
+        lqw.orderByAsc(ActivityAdvertising::getSort);
         lqw.like(StrUtil.isNotBlank(bo.getAdvName()), ActivityAdvertising::getAdvName, bo.getAdvName());
         return entity2Vo(this.list(lqw));
     }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -284,7 +284,7 @@
         <if test="userId != null and userId != ''">
             and u.user_id= #{userId}
         </if>
-        order by u.update_time desc
+        order by u.create_time desc
     </select>