From d643b843cc794d8f59c4ecd04bda2b9d35e5b22a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 19:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java
index d27b71d..183ed83 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java
@@ -12,6 +12,7 @@
     @ApiModelProperty(value = "商品id")
     private Integer commodityId;
 
+
     @ApiModelProperty(value = "商品图片")
     private String commodityImg;
 
@@ -25,4 +26,7 @@
     @ApiModelProperty(value = "商品类型")
     private Integer goodsType;
 
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
 }

--
Gitblit v1.7.1