From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSaleExtraInfo.java |   39 +++++++++++++++++++++++----------------
 1 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSaleExtraInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSaleExtraInfo.java
index e05bad6..29fb39e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSaleExtraInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSaleExtraInfo.java
@@ -3,13 +3,9 @@
 import java.util.Date;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
 /**
@@ -17,7 +13,6 @@
  *
  * @date 2018骞�11鏈�20鏃�
  */
-@Entity
 @Table(name = "yeshi_ec_threesale_extra_info")
 @org.yeshi.utils.mybatis.Table("yeshi_ec_threesale_extra_info")
 public class ThreeSaleExtraInfo {
@@ -28,33 +23,30 @@
 	@org.yeshi.utils.mybatis.Column(name = "tf_id")
 	private Long id;
 	
-	@JoinColumn(name = "tf_boss_id")
-	@ManyToOne(fetch = FetchType.EAGER)
 	@org.yeshi.utils.mybatis.Column(name = "tf_boss_id")
 	private UserInfo boss;//閭�璇疯��
-	
-	@JoinColumn(name = "tf_worker_id")
-	@ManyToOne(fetch = FetchType.EAGER)
+
 	@org.yeshi.utils.mybatis.Column(name = "tf_worker_id")
 	private UserInfo worker; //琚個璇疯��
 	
-	@JoinColumn(name = "tf_nickname")
 	@org.yeshi.utils.mybatis.Column(name = "tf_nickname")
 	private String nickname; // 澶囨敞鍚�
 	
-	@JoinColumn(name = "tf_remind_boss")
 	@org.yeshi.utils.mybatis.Column(name = "tf_remind_boss")
 	private Integer remindBoss; // 鎻愮ずboss缁戝畾寰俊   1 宸叉彁閱�
 	
-	@JoinColumn(name = "tf_remind_worker")
 	@org.yeshi.utils.mybatis.Column(name = "tf_remind_worker")
 	private Integer remindWorker; // 鎻愮ずworker缁戝畾寰俊  1 宸叉彁閱�
 	
-	@JoinColumn(name = "tf_createtime")
+	@org.yeshi.utils.mybatis.Column(name = "tf_type")
+	private Integer type; // 1-涓�绾�  2浜岀骇
+	
+	@org.yeshi.utils.mybatis.Column(name = "tf_tags")
+	private String tags; // 鏍囩
+	
 	@org.yeshi.utils.mybatis.Column(name = "tf_createtime")
 	private Date createTime; // 鍒涘缓鏃堕棿
 
-	@JoinColumn(name = "tf_updatetime")
 	@org.yeshi.utils.mybatis.Column(name = "tf_updatetime")
 	private Date updateTime; // 鏇存柊鏃堕棿
 
@@ -121,6 +113,21 @@
 	public void setRemindBoss(Integer remindBoss) {
 		this.remindBoss = remindBoss;
 	}
-	
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	public String getTags() {
+		return tags;
+	}
+
+	public void setTags(String tags) {
+		this.tags = tags;
+	}
 	
 }

--
Gitblit v1.8.0