Merge remote-tracking branch 'origin/master'

rk

12 小时以前 4a7c8d6ac4d2c38ac0c0145a54ab07b7ad5615f3

 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")