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

huanghongfa

2021-09-24 7a282d69e08d875a016975ea4b980bec98a9bab8

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java

@@ -70,4 +70,7 @@

    @ApiModelProperty(value = "街路巷id")
    private Long villageId;

    @ApiModelProperty(value = "回显路径")
    private String path;
}