Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-10-27 695cb6d76b838b1e4cb161bae335faa948dca12a

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java

@@ -100,10 +100,11 @@
   /**
    * 状态修改
    */
    @ApiOperation("状态修改")
   @SaCheckPermission("system:oss:edit")
   @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
   @PutMapping("/changeStatus")
   public AjaxResult changeStatus(@RequestBody SysOssConfigBo bo) {
    public AjaxResult<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
      return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
   }
}