From 47f157086a556d96e7bcfc9adfe17ecf7c154dfe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 08 六月 2020 17:27:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/vo/goods/OtherInfo.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/vo/goods/OtherInfo.java b/fanli/src/main/java/com/yeshi/fanli/vo/goods/OtherInfo.java
index 4734ee0..e0311d6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/vo/goods/OtherInfo.java
+++ b/fanli/src/main/java/com/yeshi/fanli/vo/goods/OtherInfo.java
@@ -27,11 +27,9 @@
@Expose
private RewardCouponVO rewardCoupon;
-
+
@Expose
private String fanliMoneyPlus;
-
-
public RewardCouponVO getRewardCoupon() {
return rewardCoupon;
@@ -64,4 +62,5 @@
public void setFanliMoneyPlus(String fanliMoneyPlus) {
this.fanliMoneyPlus = fanliMoneyPlus;
}
+
}
--
Gitblit v1.8.0