From fde1eb082b0de793b36574c311ee8f3d6410feeb Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 11:22:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/vo/order/GoodsRebateVO.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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..138c079 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
@@ -6,8 +6,17 @@
 	private String actualPay; // 瀹炰粯娆�
 	private String fanliRate; // 杩斿埄姣斾緥
 	private String fanliExpect; // 棰勪及杩斿埄
-	private String commision; // 杩斿埄姣旀垨鑰呬剑閲�
+	private String commision; // 浣i噾
 	private String subsidy; // 琛ヨ创
+	private String originSubsidy; // 鍘熸湁琛ヨ创
+
+	public String getOriginSubsidy() {
+		return originSubsidy;
+	}
+
+	public void setOriginSubsidy(String originSubsidy) {
+		this.originSubsidy = originSubsidy;
+	}
 
 	public String getTitle() {
 		return title;

--
Gitblit v1.8.0