Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-28 3c12858927ce26f277ba758e520c81be599d8df1

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

@@ -23,6 +23,8 @@

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


}