Merge remote-tracking branch 'origin/master'

liujie

2023-10-07 44311853fa68f04db11d341bd374a4ac9b5ea567

 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;

}