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

Pu Zhibing

2025-03-19 e064c1165e0f7047e0a0d564569cd7c418009e67

 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;

}