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 |   41 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 39 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 a1a51ba..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
@@ -123,11 +123,23 @@
 	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 rebateLink;// 杩斿埄璇存槑閾炬帴
+	
+	@Expose
+	private String orderDesc;// 璁㈠崟鎻忚堪
 
+	
+	// 搴楅摵绫诲瀷 2.1.2鏂板
+	@Expose
+	private ClientTextStyleVO shopType;
+
+		
 
 	public String getVipOrderDesc() {
 		return vipOrderDesc;
@@ -432,4 +444,29 @@
 	public void setSubsidyList(List<String> subsidyList) {
 		this.subsidyList = subsidyList;
 	}
+
+	public String getOrderDesc() {
+		return orderDesc;
+	}
+
+	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