Merge remote-tracking branch 'origin/2.0' into 2.0

puzhibing

2024-03-11 75d8795d4a8444071f348be4082455f2ca078ffe

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

@@ -26,4 +26,7 @@
    @ApiModelProperty(value = "商品类型")
    private Integer goodsType;

    @ApiModelProperty(value = "排序")
    private Integer sort;

}