Merge remote-tracking branch 'origin/master'

44323

2023-09-26 7aa9607492e2c0b70838c53083f5362e49e74f44

 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;


}