From 638cd80799c773176b1cbe9b142c699930c241fe Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 30 八月 2021 14:18:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java
index 67352fa..a238890 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java
@@ -5,6 +5,7 @@
import lombok.Data;
import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;
@@ -15,16 +16,17 @@
* @create: 2020-12-25 09:29
**/
@Data
-@ApiModel("设置角色权限")
+@ApiModel("新增角色-设置角色权限")
public class MenuRoleVO {
@ApiModelProperty("是否全选 1 是 0 否 ")
@NotNull(message = "是否全选不能为空")
private Integer isAll;
@ApiModelProperty("所有菜单id集合")
private List<Long> menuIds;
- @ApiModelProperty("被操作的角色id")
- @Min(value = 1,message = "角色id不能为空")
+ @ApiModelProperty(value = "被操作的角色id-编辑时使用")
private Long roleId;
+ @ApiModelProperty(value = "角色名字")
+ private String roleName;
@ApiModelProperty(value = "所在社区",hidden = true)
private Long communityId;
}
--
Gitblit v1.7.1