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

puzhibing

2024-03-04 135aeb3706b445d6d1a937168a0fe781cf3060a8

 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;

}