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/goods/CommonGoods.java | 10 ++++++++++
1 files changed, 10 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 dc1ae7f..58c0a34 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
@@ -57,6 +57,8 @@
private String videoCover;
@Column(name = "cg_video_url")
private String videoUrl;
+ @Column(name = "cg_material_lib_type")
+ private Integer materialLibType;// 鐗╂枡搴撶被鍨� 1-钀ラ攢鍟嗗搧搴� 0-闈炶惀閿�鍟嗗搧搴�
@Column(name = "cg_createtime")
private Date createTime;
@Column(name = "cg_updatetime")
@@ -93,6 +95,14 @@
this.goodsId = goodsId;
}
+ public Integer getMaterialLibType() {
+ return materialLibType;
+ }
+
+ public void setMaterialLibType(Integer materialLibType) {
+ this.materialLibType = materialLibType;
+ }
+
public Integer getGoodsType() {
return goodsType;
}
--
Gitblit v1.8.0