From 02d8f36a2a51a2ffcacdb619bee34077da61b328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 10 一月 2019 15:23:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 5a345a5..ead0b54 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
@@ -29,13 +29,15 @@
// 瀹為檯鎬绘暟閲�
private Integer totalCount;
// 瀹為檯鎬讳粯娆�
- private BigDecimal totalSettlement;
+ private BigDecimal totalPayment;
+ // 瀹為檯鎬荤粨绠�
+ private BigDecimal totalSettlement;
// 绾㈠寘绫诲瀷锛�
private Integer hongBaoType;
// 璁㈠崟鎬婚浼板閲�
private BigDecimal hongBao;
- // 璁㈠崟鐘舵�� 1 娣樺疂 2 澶╃尗
+ // 1 娣樺疂 2 澶╃尗
@Expose
private Integer orderType;
// 绾㈠寘鐘舵��
@@ -47,6 +49,9 @@
// 绾㈠寘绫诲瀷鍥剧墖閾炬帴
@Expose
private String hongBaoTypePic;
+ // 璁㈠崟: 鑷喘 鍒嗕韩 閭�璇�
+ @Expose
+ private String orderOrigin;
// 璁㈠崟鐘舵��
@Expose
private Map<String, String> orderState;
@@ -208,5 +213,21 @@
this.accountState = accountState;
}
+ public String getOrderOrigin() {
+ return orderOrigin;
+ }
+
+ public void setOrderOrigin(String orderOrigin) {
+ this.orderOrigin = orderOrigin;
+ }
+
+ public BigDecimal getTotalPayment() {
+ return totalPayment;
+ }
+
+ public void setTotalPayment(BigDecimal totalPayment) {
+ this.totalPayment = totalPayment;
+ }
+
}
--
Gitblit v1.8.0