Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

mitao

2025-03-18 d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256

 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;