From dd865e62a9e687aeb2436a59a76bbe461bd83eaf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 27 十二月 2018 09:45:00 +0800
Subject: [PATCH] 返回字段结构调整

---
 fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 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 c6dce41..5a345a5 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
@@ -34,9 +34,13 @@
  	private Integer hongBaoType;
     // 璁㈠崟鎬婚浼板閲�
  	private BigDecimal hongBao;
+ 	
+ 	// 璁㈠崟鐘舵��  1 娣樺疂 2 澶╃尗
+  	@Expose
+    private Integer orderType;
  	// 绾㈠寘鐘舵��
+ 	@Expose
     private Integer hongBaoState;
-   
     // 鍒拌处鏃堕棿
     @Expose
     private String hongBaoDate;
@@ -51,7 +55,7 @@
     private Map<String, String> hongBaoInfo;
 	// 鍒拌处鐘舵��
  	@Expose
-    private String accountState;
+ 	private Map<String, String> accountState;
     // 鍒涘缓鏃堕棿 鏁板瓧鏍煎紡
     @Expose
     private Long obtainTime;
@@ -187,11 +191,20 @@
 		this.hongBaoDate = hongBaoDate;
 	}
 
-	public String getAccountState() {
+
+	public Integer getOrderType() {
+		return orderType;
+	}
+
+	public void setOrderType(Integer orderType) {
+		this.orderType = orderType;
+	}
+
+	public Map<String, String> getAccountState() {
 		return accountState;
 	}
 
-	public void setAccountState(String accountState) {
+	public void setAccountState(Map<String, String> accountState) {
 		this.accountState = accountState;
 	}
 

--
Gitblit v1.8.0