Merge branch 'local_20221024' into huacheng_test

yanghui

2022-10-27 c6801502d6fbe00be00caf3d8138789bd63b1175

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

@@ -10,7 +10,7 @@
@ApiModel
public class StreetVOS {
    @ApiModelProperty("街道id")
    private Integer id;
    private Long id;

    @ApiModelProperty("街道名")
    private String name;