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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

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

@@ -92,4 +92,7 @@

    @ApiModelProperty("行政区域")
    private String administrativeRegions;

    @ApiModelProperty("调解站电话")
    private String solvePhone;
}