Merge branch 'dev' into 'mp-server-test'

创客列表排序

See merge request quanshu/mp-server!1026

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelApplyController.java

@@ -60,7 +60,9 @@ public class ChannelApplyController extends BaseApiController {
         List<ChannelApply> list = channelApplyService.list(new LambdaQueryWrapper<ChannelApply>()
             .like(StringUtils.isNotBlank(channelApply.getName()), ChannelApply::getName, channelApply.getName())
             .eq(StringUtils.isNotBlank(channelApply.getPhone()), ChannelApply::getPhone, channelApply.getPhone())
-            .eq(channelApply.getStatus() != null, ChannelApply::getStatus, channelApply.getStatus()));
+            .eq(channelApply.getStatus() != null, ChannelApply::getStatus, channelApply.getStatus())
+            .orderByAsc(ChannelApply::getStatus)
+            .orderByDesc(ChannelApply::getId));
         return getDataTable(list);
     }