From 117bb1c6a02d99546dd4bf953aeec67b1ab3d94e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 十二月 2018 14:52:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 19 +++++++++++++++----
1 files changed, 15 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 5066338..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
@@ -35,7 +35,9 @@
// 璁㈠崟鎬婚浼板閲�
private BigDecimal hongBao;
-
+ // 璁㈠崟鐘舵�� 1 娣樺疂 2 澶╃尗
+ @Expose
+ private Integer orderType;
// 绾㈠寘鐘舵��
@Expose
private Integer hongBaoState;
@@ -53,7 +55,7 @@
private Map<String, String> hongBaoInfo;
// 鍒拌处鐘舵��
@Expose
- private String accountState;
+ private Map<String, String> accountState;
// 鍒涘缓鏃堕棿 鏁板瓧鏍煎紡
@Expose
private Long obtainTime;
@@ -189,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