Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7

 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;
}