From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-activity/src/main/java/com/dsh/activity/feignclient/model/IntegralCommodity.java |    5 +++++
 1 files changed, 5 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 f8b2f2b..400d0b7 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;
 
@@ -21,4 +22,8 @@
     @ApiModelProperty(value = "商品价格")
     private BigDecimal commodityPrice;
 
+
+    @ApiModelProperty(value = "商品类型")
+    private Integer goodsType;
+
 }

--
Gitblit v1.7.1