diff --git a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java index 513c13b1..d55600a6 100644 --- a/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java +++ b/zheng-upms/zheng-upms-server/src/main/java/com/zheng/upms/server/controller/manage/UpmsRoleController.java @@ -56,7 +56,7 @@ public class UpmsRoleController extends BaseController { return "/manage/role/index"; } - @ApiOperation(value = "角色授权") + @ApiOperation(value = "角色权限") @RequiresPermissions("upms:role:permission") @RequestMapping(value = "/permission/{id}", method = RequestMethod.GET) public String permission(@PathVariable("id") int id, ModelMap modelMap) { @@ -65,7 +65,7 @@ public class UpmsRoleController extends BaseController { return "/manage/role/permission"; } - @ApiOperation(value = "角色授权") + @ApiOperation(value = "角色权限") @RequiresPermissions("upms:role:permission") @RequestMapping(value = "/permission/{id}", method = RequestMethod.POST) @ResponseBody diff --git a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp index 0d019722..46ca9b75 100644 --- a/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp +++ b/zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp @@ -21,7 +21,7 @@ 新增角色 编辑角色 删除角色 - 角色授权 + 角色权限
@@ -207,7 +207,7 @@ function deleteAction() { }); } } -// 授权 +// 角色权限 var permissionDialog; var roleId; function permissionAction() { @@ -229,7 +229,7 @@ function permissionAction() { roleId = rows[0].roleId; permissionDialog = $.dialog({ animationSpeed: 300, - title: '角色授权', + title: '角色权限', content: 'url:${basePath}/manage/role/permission/' + roleId, onContentReady: function () { initMaterialInput();