From e40d1c22c7202aac843c66f9ee9cc000744f9e10 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 六月 2020 15:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/vo/order/CommonOrderVO.java | 14 ++++++++++++++
1 files changed, 14 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 7fd7395..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
@@ -134,6 +134,12 @@
@Expose
private String orderDesc;// 璁㈠崟鎻忚堪
+
+ // 搴楅摵绫诲瀷 2.1.2鏂板
+ @Expose
+ private ClientTextStyleVO shopType;
+
+
public String getVipOrderDesc() {
return vipOrderDesc;
@@ -454,5 +460,13 @@
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