Merge remote-tracking branch 'origin/master'

liujie

2023-08-04 e5b1b6dafddcb32fb910abccbfa6bd98a0d64c0a

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

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


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

}