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-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java
index 4ca5b4f..fe2f7ec 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/IntegralCommodity.java
@@ -21,4 +21,10 @@
     @ApiModelProperty(value = "商品价格")
     private BigDecimal commodityPrice;
 
+    @ApiModelProperty(value = "商品类型")
+    private Integer goodsType;
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+
 }

--
Gitblit v1.7.1