Merge remote-tracking branch 'origin/master'

nickchange

2023-11-16 7042adfac9eb4fcdb6cae5c9471727cdaeb358b5

 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;


}