From c53f14a5c5d0bb6623987de84ef1bb8f8a8dbb3f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 14 一月 2019 18:13:24 +0800
Subject: [PATCH] Merge branch 'div1'
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 76 +++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 1 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 ead0b54..5eb555e 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
@@ -74,7 +74,26 @@
@Expose
private List<CommonOrderGoodsVO> listOrderGoods = new ArrayList<CommonOrderGoodsVO>();
+
+ // 鐩存帴鏀剁泭浜�-ID
+ private String userId;
+ // 鐩存帴鏀剁泭浜�-鏄电О
+ private String userName;
+ // 鐩存帴鏀剁泭浜�-澶村儚
+ private String userPortrait; // 澶村儚
+
+ // 涓�绾ф敹鐩婁汉-ID
+ private String levelOneId;
+ // 涓�绾ф敹鐩婁汉-閲戦
+ private String levelOneMoney;
+ // 浜岀骇鏀剁泭浜�-ID
+ private String levelTwoId;
+ // 浜岀骇鏀剁泭浜�-閲戦
+ private String levelTwoMoney;
+
+
+
public Date getAccountTime() {
return accountTime;
}
@@ -229,5 +248,60 @@
this.totalPayment = totalPayment;
}
-
+ public String getLevelOneId() {
+ return levelOneId;
+ }
+
+ public void setLevelOneId(String levelOneId) {
+ this.levelOneId = levelOneId;
+ }
+
+ public String getLevelOneMoney() {
+ return levelOneMoney;
+ }
+
+ public void setLevelOneMoney(String levelOneMoney) {
+ this.levelOneMoney = levelOneMoney;
+ }
+
+ public String getLevelTwoId() {
+ return levelTwoId;
+ }
+
+ public void setLevelTwoId(String levelTwoId) {
+ this.levelTwoId = levelTwoId;
+ }
+
+ public String getLevelTwoMoney() {
+ return levelTwoMoney;
+ }
+
+ public void setLevelTwoMoney(String levelTwoMoney) {
+ this.levelTwoMoney = levelTwoMoney;
+ }
+
+ public String getUserId() {
+ return userId;
+ }
+
+ public void setUserId(String userId) {
+ this.userId = userId;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getUserPortrait() {
+ return userPortrait;
+ }
+
+ public void setUserPortrait(String userPortrait) {
+ this.userPortrait = userPortrait;
+ }
+
}
--
Gitblit v1.8.0