Merge remote-tracking branch 'origin/zzj' into zzj

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/MenuRoleVO.java

@@ -1,13 +1,12 @@
package com.panzhihua.common.model.vos.user;

import java.util.List;

import javax.validation.constraints.NotNull;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -27,6 +26,6 @@
    private Long roleId;
    @ApiModelProperty(value = "角色名字")
    private String roleName;
    @ApiModelProperty(value = "所在社区",hidden = true)
    @ApiModelProperty(value = "所在社区", hidden = true)
    private Long communityId;
}