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

优化

See merge request quanshu/mp-server!1027

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

@@ -57,6 +57,7 @@ public class ChannelApplyController extends BaseApiController {
     )
     @PreAuthorize("@ss.hasPermi('business:apply:list')")
     public TableDataInfo list(@RequestBody ChannelApply channelApply) {
+        startPage();
         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())
@@ -72,7 +73,6 @@ public class ChannelApplyController extends BaseApiController {
         @ApiImplicitParam(name = "id", value = "创客申请id", required = true, paramType = "path", dataType = "long")
     )
     @PreAuthorize("@ss.hasPermi('business:apply:update')")
-
     public AjaxResult update(@PathVariable("id") Long id) {
         channelApplyService.update(new LambdaUpdateWrapper<ChannelApply>()
             .set(ChannelApply::getStatus, 1)