Merge branch 'master' into test

puhanshu

2021-12-29 ca4034c3a285f2c22fa19e5eaa88d505b5588c0b

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngVillageVO.java

@@ -64,4 +64,7 @@

    @ApiModelProperty("车辆数")
    private Integer carTotal = 0;

    @ApiModelProperty("名称")
    private String name;
}