From ecf9f0669734d4397aa1277f9a22f515aa410062 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 20 六月 2019 17:04:11 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/entity/goods/ShareGoodsTextTemplate.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/goods/ShareGoodsTextTemplate.java b/fanli/src/main/java/com/yeshi/fanli/entity/goods/ShareGoodsTextTemplate.java
index cf5fb12..d38bdae 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/goods/ShareGoodsTextTemplate.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/goods/ShareGoodsTextTemplate.java
@@ -21,6 +21,8 @@
private String shareTextTemplate;// 鏅�氬晢鍝佸垎浜ā鏉�
@Column(name = "st_share_coupon_text_template")
private String shareCouponTextTemplate;// 鍒稿垎浜ā鏉�
+ @Column(name = "st_share_taolijin_text_template")
+ private String shareTaoLiJinTextTemplate;// 娣樼ぜ閲戝垎浜ā鏉�
@Column(name = "st_create_time")
private Date createTime;
@Column(name = "st_update_time")
@@ -73,4 +75,12 @@
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+
+ public String getShareTaoLiJinTextTemplate() {
+ return shareTaoLiJinTextTemplate;
+ }
+
+ public void setShareTaoLiJinTextTemplate(String shareTaoLiJinTextTemplate) {
+ this.shareTaoLiJinTextTemplate = shareTaoLiJinTextTemplate;
+ }
}
--
Gitblit v1.8.0