Merge branch 'local_20221024' into huacheng_test

yanghui

2022-10-31 c8ffbff633fdf61b76678ff3ca7e1916f59db7ed

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

@@ -60,4 +60,7 @@

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

    @ApiModelProperty("状态1启用0禁用")
    private Integer status;
}