Merge branch 'huacheng_push' into huacheng_test

zhaozhengjie

2022-09-08 bb37b8ff2eac4cb2ab9997a50bf68f5bde16d661

 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;