Merge remote-tracking branch 'origin/master'

luo

2023-10-08 1cb12391db6154f2d1a8fdf8e0506fe3f3eb2f15

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

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

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


}