Merge branch 'hemenkou_dev' into dev

101captain

2022-03-03 4c84f9d32baeaa9942a4af74efce3d5b6297246d

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

@@ -28,4 +28,5 @@
    private String roleName;
    @ApiModelProperty(value = "所在社区", hidden = true)
    private Long communityId;
    private String areaCode;
}