From 8f4a68065574a7ef1f9e8b53902d1f081ec69aab Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 17 三月 2020 10:58:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java b/fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java
index ef39fe8..7cee102 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java
@@ -65,6 +65,9 @@
private Integer materialLibType;// 鐗╂枡搴撶被鍨� 1-钀ラ攢鍟嗗搧搴� 0-闈炶惀閿�鍟嗗搧搴�
@Column(name = "cg_other_info")
private String otherInfo; // 鍟嗗搧鍏朵粬淇℃伅-json瀛楃涓�
+ @Column(name = "cg_category_info")
+ private String categoryInfo; // 鍟嗗搧鍒嗙被淇℃伅
+
@Column(name = "cg_createtime")
private Date createTime;
@Column(name = "cg_updatetime")
@@ -268,5 +271,13 @@
public void setOtherInfo(String otherInfo) {
this.otherInfo = otherInfo;
}
+
+ public String getCategoryInfo() {
+ return categoryInfo;
+ }
+
+ public void setCategoryInfo(String categoryInfo) {
+ this.categoryInfo = categoryInfo;
+ }
}
--
Gitblit v1.8.0