Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-11-09 47fe0e855db23220c548fb1d3fe641e18715248a

 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;