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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

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

@@ -62,6 +62,6 @@
    private Integer cardType;

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

}