From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 42 +++++++++++++++++++++++-------------------
1 files changed, 23 insertions(+), 19 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 6854ce8..77520d4 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
@@ -129,13 +129,17 @@
private String vipOrderDesc;// 瓒呯骇璁㈠崟鎻忚堪(2.1涔嬪悗搴熷純)
@Expose
- private String fanliDesc;// 杩斿埄璇存槑
- @Expose
- private String fanliDescLink;// 杩斿埄璇存槑閾炬帴
+ private String rebateLink;// 杩斿埄璇存槑閾炬帴
@Expose
private String orderDesc;// 璁㈠崟鎻忚堪
+
+ // 搴楅摵绫诲瀷 2.1.2鏂板
+ @Expose
+ private ClientTextStyleVO shopType;
+
+
public String getVipOrderDesc() {
return vipOrderDesc;
@@ -441,22 +445,6 @@
this.subsidyList = subsidyList;
}
- public String getFanliDesc() {
- return fanliDesc;
- }
-
- public void setFanliDesc(String fanliDesc) {
- this.fanliDesc = fanliDesc;
- }
-
- public String getFanliDescLink() {
- return fanliDescLink;
- }
-
- public void setFanliDescLink(String fanliDescLink) {
- this.fanliDescLink = fanliDescLink;
- }
-
public String getOrderDesc() {
return orderDesc;
}
@@ -464,5 +452,21 @@
public void setOrderDesc(String orderDesc) {
this.orderDesc = orderDesc;
}
+
+ public String getRebateLink() {
+ return rebateLink;
+ }
+
+ public void setRebateLink(String rebateLink) {
+ this.rebateLink = rebateLink;
+ }
+
+ public ClientTextStyleVO getShopType() {
+ return shopType;
+ }
+
+ public void setShopType(ClientTextStyleVO shopType) {
+ this.shopType = shopType;
+ }
}
--
Gitblit v1.8.0