Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

puzhibing

2024-03-11 50a4e8cae497f7b5071df1153365a776cc9c6a5f

 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;

@@ -25,4 +26,7 @@
    @ApiModelProperty(value = "商品类型")
    private Integer goodsType;

    @ApiModelProperty(value = "排序")
    private Integer sort;

}