Merge remote-tracking branch 'origin/master'

src/main/java/com/yxt/yyth/biz/lpkstore/LpkStoreService.java

@@ -31,8 +31,8 @@ public class LpkStoreService extends MybatisBaseService<LpkStoreMapper, LpkStore
         if (StringUtils.isNotBlank(query.getName())) {
             qw.like("st.name", query.getName());
         }
-        qw.orderByDesc("createTime");
         qw.orderByAsc("st.sort");
+        qw.orderByDesc("createTime");
         IPage<LpkStore> page = PagerUtil.queryToPage(pq);
         IPage<LpkStoreVo> pagging = baseMapper.storeListPage(page, qw);
         PagerVo<LpkStoreVo> p = PagerUtil.pageToVo(pagging, null);