From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 10e1f16..7fd7395 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
@@ -123,15 +123,16 @@
private Integer otherState; // 1鍏嶅崟
@Expose
- private boolean vipOrder;// 鏄惁涓鸿秴绾х敤鎴疯鍗�
+ private boolean vipOrder;// 鏄惁涓鸿秴绾х敤鎴疯鍗�(2.1涔嬪悗搴熷純)
@Expose
- private String vipOrderDesc;// 瓒呯骇璁㈠崟鎻忚堪
+ private String vipOrderDesc;// 瓒呯骇璁㈠崟鎻忚堪(2.1涔嬪悗搴熷純)
@Expose
- private String fanliDesc;// 杩斿埄璇存槑
+ private String rebateLink;// 杩斿埄璇存槑閾炬帴
+
@Expose
- private String fanliDescLink;// 杩斿埄璇存槑閾炬帴
+ private String orderDesc;// 璁㈠崟鎻忚堪
public String getVipOrderDesc() {
@@ -438,20 +439,20 @@
this.subsidyList = subsidyList;
}
- public String getFanliDesc() {
- return fanliDesc;
+ public String getOrderDesc() {
+ return orderDesc;
}
- public void setFanliDesc(String fanliDesc) {
- this.fanliDesc = fanliDesc;
+ public void setOrderDesc(String orderDesc) {
+ this.orderDesc = orderDesc;
}
- public String getFanliDescLink() {
- return fanliDescLink;
+ public String getRebateLink() {
+ return rebateLink;
}
- public void setFanliDescLink(String fanliDescLink) {
- this.fanliDescLink = fanliDescLink;
+ public void setRebateLink(String rebateLink) {
+ this.rebateLink = rebateLink;
}
}
--
Gitblit v1.8.0