Merge remote-tracking branch 'origin/master'

liujie

2023-08-07 f5ca8f01cf6b8256a25e8c6838d805fe3fca43fc

 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=积分+现金)")