From d22d18f40d088277195e5c3ab587d07450f1a94d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 22 四月 2020 18:22:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/vo/order/OrderRebateVO.java | 30 +-----------------------------
1 files changed, 1 insertions(+), 29 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/order/OrderRebateVO.java b/fanli/src/main/java/com/yeshi/fanli/vo/order/OrderRebateVO.java
index c37a676..f8a9df7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/order/OrderRebateVO.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/order/OrderRebateVO.java
@@ -18,10 +18,6 @@
private String userLevel; // 鐢ㄦ埛绛夌骇
private String jumpLink; // 璺宠浆閾炬帴
- private String subsidyDesc; // 鍥㈤槦璇存槑
- private String subsidy; // 鍥㈤槦琛ヨ创
- private String originSubsidy; // 灏忎竴绛夌骇琛ヨ创
-
private Integer couponType; // 鍒稿浘鏍囷細1-濂栧姳鍒� 2-鍏嶅崟鍒�
private boolean coupon; // 浣跨敤濂栧姳鍒�
private boolean couponUse; // 宸蹭娇鐢ㄥ埜
@@ -127,31 +123,7 @@
public void setFanLiDesc(String fanLiDesc) {
this.fanLiDesc = fanLiDesc;
}
-
- public String getSubsidy() {
- return subsidy;
- }
-
- public void setSubsidy(String subsidy) {
- this.subsidy = subsidy;
- }
-
- public String getOriginSubsidy() {
- return originSubsidy;
- }
-
- public void setOriginSubsidy(String originSubsidy) {
- this.originSubsidy = originSubsidy;
- }
-
- public String getSubsidyDesc() {
- return subsidyDesc;
- }
-
- public void setSubsidyDesc(String subsidyDesc) {
- this.subsidyDesc = subsidyDesc;
- }
-
+
public String getCouponParams() {
return couponParams;
}
--
Gitblit v1.8.0