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

创客申请排序优化

See merge request quanshu/mp-server!1034

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

@@ -62,7 +62,8 @@ public class ChannelApplyController extends BaseApiController {
             .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())
-            .orderByAsc(ChannelApply::getStatus));
+            .orderByAsc(ChannelApply::getStatus)
+            .orderByDesc(ChannelApply::getId));
         return getDataTable(list);
     }