From 00026c4255ed1b47961d17a5b4500fe788bfa9d8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 17 九月 2019 09:45:50 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSaleExtraInfo.java | 17 +++--------------
1 files changed, 3 insertions(+), 14 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..85e405c 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,27 @@
@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_createtime")
private Date createTime; // 鍒涘缓鏃堕棿
- @JoinColumn(name = "tf_updatetime")
@org.yeshi.utils.mybatis.Column(name = "tf_updatetime")
private Date updateTime; // 鏇存柊鏃堕棿
--
Gitblit v1.8.0