From 09c716a16d02ddb06df2bc2af5e588128bc7fdb4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 05 十一月 2019 11:30:41 +0800
Subject: [PATCH] 品牌接口恢复

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java |   14 +++++++++-----
 1 files changed, 9 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 a34fe3f..6d8518c 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 {
@@ -27,19 +26,24 @@
 	public static int EXPIRE_NORMAL = 0;// 姝e父鐘舵��
 	public static int EXPIRE_OUTOFDATE = 1;// 杩囨湡鐘舵��
 
+	public static int STATE_SUCCESS = 1;// 鎴愬姛
+	public static int STATE_NOT_SUCCESS = 0;// 灏氭湭鎴愬姛
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "id")
 	private Long id;
 
-	@ManyToOne
-	@JoinColumn(name = "boss_id")
+	public ThreeSale(Long id) {
+		this.id = id;
+	}
+
+	public ThreeSale() {
+	}
+
 	@Column(name = "boss_id")
 	private UserInfo boss;// 閭�璇疯��
 
-	@OneToOne
-	@JoinColumn(name = "worker_id")
 	@Column(name = "worker_id")
 	private UserInfo worker; // 琚個璇疯��
 

--
Gitblit v1.8.0