From 36a6c7f1d1bc054a987aeabb4ab6d9f1278d8e4d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 四月 2019 09:36:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java
index de80ceb..270b65e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java
@@ -93,6 +93,9 @@
 	// 鐩存帴鏀剁泭浜�-澶村儚
    	private String userPortrait; // 澶村儚
    	
+    // 绾㈠寘ID
+ 	private Long hongbaoId;
+ 	
     // 涓�绾ф敹鐩婁汉-ID
  	private String levelOneId;
  	// 涓�绾ф敹鐩婁汉-閲戦
@@ -340,4 +343,12 @@
 		this.couponMoney = couponMoney;
 	}
 
+	public Long getHongbaoId() {
+		return hongbaoId;
+	}
+
+	public void setHongbaoId(Long hongbaoId) {
+		this.hongbaoId = hongbaoId;
+	}
+
 }

--
Gitblit v1.8.0