Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 9b1acfe1b5786a3a3e3e849a5729d68fa05c3a1a

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/StreetVO.java

@@ -12,7 +12,7 @@
public class StreetVO implements Serializable {

    @ApiModelProperty("街道id")
    private Integer id;
    private Long id;

    @ApiModelProperty("街道名")
    private String name;