Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java

fs-company/src/main/java/com/fs/company/controller/store/FsUserController.java

@@ -261,7 +261,7 @@ public class FsUserController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('users:user:blacklist')")
     @GetMapping("/blacklist")
-    @ApiOperation("小黑屋")
+    @ApiOperation("黑名单")
     public R blacklist(FsUserPageListParam param) {
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         param.setUserId(loginUser.getUser().getUserId());