From 010760fd974453a70948fef465284d8c817314f5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 25 三月 2020 11:27:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/entity/order/InviteOrderSubsidy.java | 22 ++++++++++++++++++++++
1 files changed, 22 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 54b9192..cbd6099 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
@@ -6,6 +6,8 @@
import org.yeshi.utils.mybatis.Column;
import org.yeshi.utils.mybatis.Table;
+import jxl.write.DateTime;
+
/**
* 閭�璇疯鍗曡ˉ璐�
*
@@ -59,6 +61,26 @@
private Date getTime;
@Column(name = "os_level")
private Integer level;// 鐩存帴/闂存帴
+ @Column(name = "os_valid_time")
+ private Date validTime;
+ @Column(name = "os_invalid_time")
+ private Date inValidTime;
+
+ public Date getInValidTime() {
+ return inValidTime;
+ }
+
+ public void setInValidTime(Date inValidTime) {
+ this.inValidTime = inValidTime;
+ }
+
+ public Date getValidTime() {
+ return validTime;
+ }
+
+ public void setValidTime(Date validTime) {
+ this.validTime = validTime;
+ }
public Integer getLevel() {
return level;
--
Gitblit v1.8.0