Merge branch 'haucheng_panzhihua' into huacheng_test

zhaozhengjie

2022-09-17 fe1a0613d48e9b76b474d22073e72feda23b0d5c

 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;