From a3e1aec60d2f886b8c48966c889b567719d0c5ea Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 16 十月 2019 16:50:25 +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 | 6 +++---
1 files changed, 3 insertions(+), 3 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 5c105cf..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
@@ -26,6 +26,8 @@
public static int EXPIRE_NORMAL = 0;// 姝ｅ父鐘舵��
public static int EXPIRE_OUTOFDATE = 1;// 杩囨湡鐘舵��
+ public static int STATE_SUCCESS = 1;// 鎴愬姛
+ public static int STATE_NOT_SUCCESS = 0;// 灏氭湭鎴愬姛
@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@@ -35,14 +37,12 @@
public ThreeSale(Long id) {
this.id = id;
}
-
+
public ThreeSale() {
}
-
@Column(name = "boss_id")
private UserInfo boss;// 閭�璇疯��
-
@Column(name = "worker_id")
private UserInfo worker; // 琚個璇疯��
--
Gitblit v1.8.0