合并代码

puzhibing

2023-12-14 f21cf2729f0ebf3cfea564c8bc0fc7349cdabe48

 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;

}