From b16f2b0126281e87346db9e6efd1db960ecc872a Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 15 三月 2020 21:44:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 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 a1a51ba..10e1f16 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
@@ -127,6 +127,11 @@
 	
 	@Expose
 	private String vipOrderDesc;// 瓒呯骇璁㈠崟鎻忚堪
+	
+	@Expose
+	private String fanliDesc;// 杩斿埄璇存槑
+	@Expose
+	private String fanliDescLink;// 杩斿埄璇存槑閾炬帴
 
 
 	public String getVipOrderDesc() {
@@ -432,4 +437,21 @@
 	public void setSubsidyList(List<String> subsidyList) {
 		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;
+	}
+	
 }

--
Gitblit v1.8.0