From e97065519838a1ebbee870eefae6eae9f5d91647 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 十一月 2019 14:10:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/elme/ElmeOrder.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 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 2766a77..3313dcf 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
@@ -56,6 +56,11 @@
 	@Column(name = "eo_update_time")
 	private Date updateTime;
 
+	
+	private Long uid;
+	private BigDecimal hongbao;
+	private Integer hbState;
+	
 	public Long getId() {
 		return id;
 	}
@@ -200,4 +205,27 @@
 		this.updateTime = updateTime;
 	}
 
+	public Long getUid() {
+		return uid;
+	}
+
+	public void setUid(Long uid) {
+		this.uid = uid;
+	}
+
+	public BigDecimal getHongbao() {
+		return hongbao;
+	}
+
+	public void setHongbao(BigDecimal hongbao) {
+		this.hongbao = hongbao;
+	}
+
+	public Integer getHbState() {
+		return hbState;
+	}
+
+	public void setHbState(Integer hbState) {
+		this.hbState = hbState;
+	}
 }

--
Gitblit v1.8.0