From 35c25585cf6fea9e29574a75a03c57381cbe19e1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 05 八月 2019 16:35:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 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 5437953..a6c64aa 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
@@ -84,6 +84,10 @@
     @Expose
     private Map<String, Object> rewardDetail;
     
+    // 缁存潈淇℃伅
+    @Expose
+    private WeiQuanInfo weiQuanInfo;
+   
     
     
     // 鐩存帴鏀剁泭浜�-ID
@@ -379,4 +383,11 @@
 		this.otherState = otherState;
 	}
 
+	public WeiQuanInfo getWeiQuanInfo() {
+		return weiQuanInfo;
+	}
+
+	public void setWeiQuanInfo(WeiQuanInfo weiQuanInfo) {
+		this.weiQuanInfo = weiQuanInfo;
+	}
 }

--
Gitblit v1.8.0