Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-01 276571374e8f0e2be2bdcfc5e8ea4a39af1599bc

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

@@ -31,8 +31,11 @@
    @ApiModelProperty(value = "每人限额")
    private Integer perLimit;

    @ApiModelProperty(value = "所需类型（积分/积分+现金）")
    private String requiredType;
    @ApiModelProperty(value = "积分")
    private Integer integral;

    @ApiModelProperty(value = "现金")
    private BigDecimal cash;


    @ApiModelProperty(value = "兑换方式(1=积分，2=积分+现金)")