From 8ee88e8c511b75f2b2e566c37b38209a0c35afa8 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 11 九月 2023 16:46:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/service/src/main/java/com/doumee/dao/business/model/Goods.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/server/service/src/main/java/com/doumee/dao/business/model/Goods.java b/server/service/src/main/java/com/doumee/dao/business/model/Goods.java
index 180afe4..79d3966 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/Goods.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/Goods.java
@@ -117,6 +117,13 @@
     @ExcelColumn(name="鍚嶇О鎷奸煶棣栧瓧姣�")
     private String shortPinyin;
 
+    @ApiModelProperty(value = "鍟嗗搧缂栫爜锛堝叧鑱攂ase_goods琛級")
+    private Integer goodsId;
+
+    @ApiModelProperty(value = "鍒涘缓绫诲埆锛�0=鑷缓锛�1=鎷夊彇")
+    private Integer type;
+
+
     @ApiModelProperty(value = "鍓嶇紑璺緞")
     @TableField(exist = false)
     private String prefixUrl;

--
Gitblit v1.9.3