Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-10-09 d079a68e22e9e11ad4af0b11e19d9398bd62f193

 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;