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

Pu Zhibing

2024-09-24 1b8ad0cc6a79f84fb32fdffae39742afa964748e

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

@@ -26,9 +26,12 @@
    private Integer userIntegral;

    @ApiModelProperty(value = "商品列表")
    private List<IntegralCommodity>  commodities;
    private List<IntegralCommodity> commodities;

    @ApiModelProperty(value = "banners")
    private UserBenefitImage image;

    @ApiModelProperty("是否是裁判（0=否，1=是）")
    private Integer referee;

}