From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求

---
 fanli/src/main/java/com/yeshi/fanli/vo/order/GoodsRebateVO.java |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/order/GoodsRebateVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/order/GoodsRebateVO.java
index 0824207..c152efe 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/order/GoodsRebateVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/order/GoodsRebateVO.java
@@ -4,10 +4,18 @@
 	private String title; // 鍟嗗搧鏍囬
 	private String picture; // 鍟嗗搧鍥剧墖
 	private String actualPay; // 瀹炰粯娆�
-	private String fanliRate; // 杩斿埄姣斾緥
-	private String fanliExpect; // 棰勪及杩斿埄
-	private String commision; // 杩斿埄姣旀垨鑰呬剑閲�
+	private String commision; // 浣i噾
+	private String bonus; // 濂栭噾
 	private String subsidy; // 琛ヨ创
+	private String originSubsidy; // 鍘熸湁琛ヨ创
+
+	public String getOriginSubsidy() {
+		return originSubsidy;
+	}
+
+	public void setOriginSubsidy(String originSubsidy) {
+		this.originSubsidy = originSubsidy;
+	}
 
 	public String getTitle() {
 		return title;
@@ -33,13 +41,6 @@
 		this.actualPay = actualPay;
 	}
 
-	public String getFanliExpect() {
-		return fanliExpect;
-	}
-
-	public void setFanliExpect(String fanliExpect) {
-		this.fanliExpect = fanliExpect;
-	}
 
 	public String getCommision() {
 		return commision;
@@ -57,12 +58,12 @@
 		this.subsidy = subsidy;
 	}
 
-	public String getFanliRate() {
-		return fanliRate;
+
+	public String getBonus() {
+		return bonus;
 	}
 
-	public void setFanliRate(String fanliRate) {
-		this.fanliRate = fanliRate;
+	public void setBonus(String bonus) {
+		this.bonus = bonus;
 	}
-
 }

--
Gitblit v1.8.0