From c6512655e722d9ca80dd8c34b79f6d3923ecf86c Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期二, 22 六月 2021 16:07:50 +0800
Subject: [PATCH] Merge branch 'test' into 'test_screen'

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java |    5 ++---
 1 files changed, 2 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 611d68f..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
@@ -23,10 +23,9 @@
     private Integer isAll;
     @ApiModelProperty("所有菜单id集合")
     private List<Long> menuIds;
-    @ApiModelProperty(value = "被操作的角色id",hidden = true)
+    @ApiModelProperty(value = "被操作的角色id-编辑时使用")
     private Long roleId;
-    @ApiModelProperty(value = "角色名字",required = true)
-    @NotBlank(message = "角色名字不能为空")
+    @ApiModelProperty(value = "角色名字")
     private String roleName;
     @ApiModelProperty(value = "所在社区",hidden = true)
     private Long communityId;

--
Gitblit v1.7.1