From bf5c02aaecb3f7a42daa4fa356c62a2e6bca0db5 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 28 十月 2019 09:55:59 +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/order/InviteOrderSubsidy.java |   10 ++++++++++
 1 files changed, 10 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 5b1ca7e..d9d3c98 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
@@ -37,6 +37,8 @@
 	private Long uid;
 	@Column(name = "os_money")
 	private BigDecimal money;
+	@Column(name = "os_original_money")
+	private BigDecimal originalMoney;// 鍘熻繑鍒�
 	@Column(name = "os_order_no")
 	private String orderNo;
 	@Column(name = "os_source_type")
@@ -112,4 +114,12 @@
 		this.updateTime = updateTime;
 	}
 
+	public BigDecimal getOriginalMoney() {
+		return originalMoney;
+	}
+
+	public void setOriginalMoney(BigDecimal originalMoney) {
+		this.originalMoney = originalMoney;
+	}
+
 }

--
Gitblit v1.8.0