From 1193f141ae9499d2446aa99e9c4fdc75e7552b7d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 10 四月 2020 17:07:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/vo/order/HongBaoV2VO.java |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/order/HongBaoV2VO.java b/fanli/src/main/java/com/yeshi/fanli/vo/order/HongBaoV2VO.java
index aac71b7..93836d2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/order/HongBaoV2VO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/order/HongBaoV2VO.java
@@ -7,15 +7,21 @@
 
 /**
  * 绾㈠寘v2
-
+ * 
  */
 
 public class HongBaoV2VO extends HongBaoV2 implements Serializable {
 
 	private static final long serialVersionUID = 1L;
-	
+
 	// 鎬婚噾棰�
- 	private BigDecimal totalMoney;
+	private BigDecimal totalMoney;
+
+	// 鎬婚噾棰�-鏈夋晥
+	private BigDecimal validMoney;
+
+	// 褰撳墠鐘舵��
+	private int currentState;
 
 	public BigDecimal getTotalMoney() {
 		return totalMoney;
@@ -24,5 +30,21 @@
 	public void setTotalMoney(BigDecimal totalMoney) {
 		this.totalMoney = totalMoney;
 	}
- 	
+
+	public BigDecimal getValidMoney() {
+		return validMoney;
+	}
+
+	public void setValidMoney(BigDecimal validMoney) {
+		this.validMoney = validMoney;
+	}
+
+	public int getCurrentState() {
+		return currentState;
+	}
+
+	public void setCurrentState(int currentState) {
+		this.currentState = currentState;
+	}
+
 }

--
Gitblit v1.8.0