合并分支 'yjzx_dev' 到 'yjzx_test'

排序调整

查看合并请求 !10

src/main/java/com/zzsn/thinktank/service/impl/ThinktankBasicInfoServiceImpl.java

@@ -845,8 +845,9 @@ public class ThinktankBasicInfoServiceImpl extends ServiceImpl<ThinktankBasicInf
             }
         }
 
-        queryWrapper.orderByAsc("SUBSTRING(english_whole, 1, 1)");
+
         queryWrapper.orderByDesc("update_time");
+        queryWrapper.orderByAsc("SUBSTRING(english_whole, 1, 1)");
         Integer total = this.getBaseMapper().selectCount(queryWrapper);
 
         Integer office = pageSize * (pageNo - 1);