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/ThreeSale.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
index 6c63486..5c105cf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java
@@ -19,7 +19,6 @@
*
* @date 2018骞�1鏈�29鏃�
*/
-@Entity
@Table(name = "yeshi_ec_threeSale")
@org.yeshi.utils.mybatis.Table("yeshi_ec_threeSale")
public class ThreeSale {
@@ -40,13 +39,11 @@
public ThreeSale() {
}
- @ManyToOne
- @JoinColumn(name = "boss_id")
+
@Column(name = "boss_id")
private UserInfo boss;// 閭�璇疯��
- @OneToOne
- @JoinColumn(name = "worker_id")
+
@Column(name = "worker_id")
private UserInfo worker; // 琚個璇疯��
--
Gitblit v1.8.0