From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java |   18 ++++++++++++++++++
 1 files changed, 18 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 270b65e..9a62235 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
@@ -106,8 +106,26 @@
  	// 浜岀骇鏀剁泭浜�-閲戦
  	private String levelTwoMoney;
  	
+ 	private String weiQuanState;//缁存潈鐘舵��
  	
+ 	private String weiQuanBackMoney;//缁存潈璧勯噾
     
+	public String getWeiQuanState() {
+		return weiQuanState;
+	}
+
+	public void setWeiQuanState(String weiQuanState) {
+		this.weiQuanState = weiQuanState;
+	}
+
+	public String getWeiQuanBackMoney() {
+		return weiQuanBackMoney;
+	}
+
+	public void setWeiQuanBackMoney(String weiQuanBackMoney) {
+		this.weiQuanBackMoney = weiQuanBackMoney;
+	}
+
 	public Date getAccountTime() {
 		return accountTime;
 	}

--
Gitblit v1.8.0