Merge remote-tracking branch 'origin/master'

nickchange

2023-10-17 3f2e0142a6db9720f6429848840ac6b214a1cd1b

 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;

}