From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBrief.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBrief.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBrief.java
index 337c82c..1753628 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBrief.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBrief.java
@@ -268,6 +268,7 @@
 	@Column
 	private Integer state;// 0-姝ｅ父 1-鍟嗗搧涓嬫灦
 	
+	@org.yeshi.utils.mybatis.Column(name = "material_lib_type")
 	@Transient
 	private Integer materialLibType;//鐗╂枡搴撶被鍨�
 	

--
Gitblit v1.8.0