From bb07147aaa96d1ef4c99e358dbbe7dad160dc62a Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:43:23 +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/elme/ElmeOrder.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/elme/ElmeOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/elme/ElmeOrder.java
index 3313dcf..6e1f0c0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/elme/ElmeOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/elme/ElmeOrder.java
@@ -55,8 +55,18 @@
 	private Date createTime;
 	@Column(name = "eo_update_time")
 	private Date updateTime;
+	@Column(name = "eo_state")
+	private Integer state;//0-澶辨晥  1-鏈夋晥
 
 	
+	public Integer getState() {
+		return state;
+	}
+
+	public void setState(Integer state) {
+		this.state = state;
+	}
+
 	private Long uid;
 	private BigDecimal hongbao;
 	private Integer hbState;

--
Gitblit v1.8.0