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

puzhibing

2024-03-11 75d8795d4a8444071f348be4082455f2ca078ffe

 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/PointDetailsVo.java

@@ -62,6 +62,6 @@
    private Integer cardType;

    @ApiModelProperty(value = "使用范围")
    private  Integer exchangeAddrType;
    private Integer exchangeAddrType;

}