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

无关风月

2025-04-11 9a60b1e59f52ab4f41e956a76eac1150f39843e3

 cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/ExchangeDetailsResponse.java

@@ -37,7 +37,7 @@
    @ApiModelProperty(value = "商品类型  1实物 2课包 3门票 4优惠券")
    private Integer goodType;

    private Integer  userId;
    private Integer userId;

    private List<Integer> rid;