From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java
index d9d3c98..54b9192 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java
@@ -14,6 +14,10 @@
  */
 @Table("yeshi_ec_invite_order_subsidy")
 public class InviteOrderSubsidy {
+
+	public static final int LEVEL_ONE = 1;// 鐩存帴琛ヨ创
+	public static final int LEVEL_TWO = 2;// 闂存帴琛ヨ创
+
 	// 鏈煡
 	public static final int STATE_UNKNOWN = 0;
 	// 鍙ˉ璐�
@@ -49,6 +53,36 @@
 	private Date createTime;
 	@Column(name = "os_update_time")
 	private Date updateTime;
+	@Column(name = "os_pre_get_time")
+	private Date preGetTime;
+	@Column(name = "os_get_time")
+	private Date getTime;
+	@Column(name = "os_level")
+	private Integer level;// 鐩存帴/闂存帴
+
+	public Integer getLevel() {
+		return level;
+	}
+
+	public void setLevel(Integer level) {
+		this.level = level;
+	}
+
+	public Date getPreGetTime() {
+		return preGetTime;
+	}
+
+	public void setPreGetTime(Date preGetTime) {
+		this.preGetTime = preGetTime;
+	}
+
+	public Date getGetTime() {
+		return getTime;
+	}
+
+	public void setGetTime(Date getTime) {
+		this.getTime = getTime;
+	}
 
 	public Long getId() {
 		return id;

--
Gitblit v1.8.0