Merge remote-tracking branch 'origin/master'

nickchange

2023-11-16 7042adfac9eb4fcdb6cae5c9471727cdaeb358b5

 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;