Merge branch 'local_20221024' into huacheng_test

yanghui

2022-10-27 19bb7fa3894b8d95ff93901bf66a8cd3f6c63a87

 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;