Merge remote-tracking branch 'origin/master'

nickchange

2023-11-15 331ae50b1cdcb31a4a0c182abb82aec5c1b12f83

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

@@ -12,6 +12,7 @@
    @ApiModelProperty(value = "商品id")
    private Integer commodityId;


    @ApiModelProperty(value = "商品图片")
    private String commodityImg;

@@ -21,4 +22,8 @@
    @ApiModelProperty(value = "商品价格")
    private BigDecimal commodityPrice;


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

}