From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 15 +++++++++++++--
1 files changed, 13 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 10e1f16..6854ce8 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,18 @@
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;// 杩斿埄璇存槑
@Expose
private String fanliDescLink;// 杩斿埄璇存槑閾炬帴
+
+ @Expose
+ private String orderDesc;// 璁㈠崟鎻忚堪
public String getVipOrderDesc() {
@@ -453,5 +456,13 @@
public void setFanliDescLink(String fanliDescLink) {
this.fanliDescLink = fanliDescLink;
}
+
+ public String getOrderDesc() {
+ return orderDesc;
+ }
+
+ public void setOrderDesc(String orderDesc) {
+ this.orderDesc = orderDesc;
+ }
}
--
Gitblit v1.8.0