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

tangxiaobao

2022-04-14 87f6cce44f87f9df74ef737ea831bed9ceed490c

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

@@ -61,4 +61,6 @@

    @ApiModelProperty("社区id")
    private Long communityId;

    private String areaCode;
}