From db88b87df461820152d68d3d55a28f30c2da83e6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 20 九月 2019 17:54:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/ThreeSale.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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 8003b49..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,23 +19,31 @@
*
* @date 2018骞�1鏈�29鏃�
*/
-@Entity
@Table(name = "yeshi_ec_threeSale")
@org.yeshi.utils.mybatis.Table("yeshi_ec_threeSale")
public class ThreeSale {
+
+ public static int EXPIRE_NORMAL = 0;// 姝ｅ父鐘舵��
+ public static int EXPIRE_OUTOFDATE = 1;// 杩囨湡鐘舵��
+
@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; // 琚個璇疯��
@@ -54,8 +62,8 @@
@Column(name = "updateTime")
private Long updateTime;
-
- @Transient
+
+ @Transient
private ThreeSaleExtraInfo threeSaleExtraInfo;
public Long getId() {
--
Gitblit v1.8.0