From 09476adf2ae2bcc2f6685dafe4707938fd82bc78 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2019 12:19:20 +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 e68b53a..ef39fe8 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
@@ -63,6 +63,8 @@
 	private String videoUrl;
 	@Column(name = "cg_material_lib_type")
 	private Integer materialLibType;// 鐗╂枡搴撶被鍨� 1-钀ラ攢鍟嗗搧搴� 0-闈炶惀閿�鍟嗗搧搴�
+	@Column(name = "cg_other_info")
+	private String otherInfo; // 鍟嗗搧鍏朵粬淇℃伅-json瀛楃涓�
 	@Column(name = "cg_createtime")
 	private Date createTime;
 	@Column(name = "cg_updatetime")
@@ -258,4 +260,13 @@
 	public void setPictureWhite(String pictureWhite) {
 		this.pictureWhite = pictureWhite;
 	}
+
+	public String getOtherInfo() {
+		return otherInfo;
+	}
+
+	public void setOtherInfo(String otherInfo) {
+		this.otherInfo = otherInfo;
+	}
+	
 }

--
Gitblit v1.8.0