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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

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

@@ -19,9 +19,15 @@
    @ApiModelProperty(value = "商品名称")
    private String commodityName;

    @ApiModelProperty(value = "1=积分，2=现金+积分, 3=现金")
    private Integer redemptionMethod;

    @ApiModelProperty(value = "商品价格")
    private BigDecimal commodityPrice;

    @ApiModelProperty(value = "支付积分")
    private Integer integral;


    @ApiModelProperty(value = "商品类型")
    private Integer goodsType;