Merge remote-tracking branch 'origin/master'

liujie

2023-10-10 cd45ac2fa0097de2fd9bf637fc5a23593be1aef0

 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;


}