Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

puzhibing

2023-12-08 f88cfa02e36752e4acad7adc4b045155e8e50f21

 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;

}