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

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

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

@@ -61,4 +61,7 @@

    private Integer cardType;

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

}