Merge remote-tracking branch 'origin/master'

doum

3 天以前 7b223c4dfdc960a6172bac87e47ab1b86b90ba1a

 server/dmmall_admin/src/main/java/com/doumee/api/business/ActivityController.java

@@ -66,6 +66,13 @@
        activityService.updateById(activity);
        return ApiResponse.success(null);
    }
    @ApiOperation("根据ID修改")
    @PostMapping("/updateStatusById")
    @RequiresPermissions("business:activity:update")
    public ApiResponse updateStatusById(@RequestBody Activity activity) {
        activityService.updateStatusById(activity);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")