Merge remote-tracking branch 'origin/master'

nickchange

2023-10-27 200acf9283ff06e75874df263b1e125a71e76215

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

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

    private Integer cardType;

}