From 02f18587bd8860b305e2c688e20465be166bb48c Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 22 七月 2021 15:14:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
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