Merge remote-tracking branch 'origin/master'

puzhibing

2023-11-25 a80311f4fb0ecad83e8bc3df59a3d596d637c0ba

 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;

}