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

mitao

2025-03-31 51f26723bee741bf112c8d0d965d0e2f2974bd04

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

@@ -59,4 +59,9 @@
    @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金)")
    private Integer exchangeType;

    private Integer cardType;

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

}