From 92ed53e44fb2da1f91b8fb9932af8ff433febe83 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 06 七月 2022 18:47:09 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/vo/api/fee/ApiFeeDataVo.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/vo/api/fee/ApiFeeDataVo.java b/java110-bean/src/main/java/com/java110/vo/api/fee/ApiFeeDataVo.java
index d316de2..7f6dbe9 100755
--- a/java110-bean/src/main/java/com/java110/vo/api/fee/ApiFeeDataVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/api/fee/ApiFeeDataVo.java
@@ -68,7 +68,7 @@
     //瀹炴敹閲戦鏄犲皠寮�鍏冲��
     private String receivedAmountSwitch;
 
-    private String deductFrom;
+    private String deductFrom = "Y";
 
     private List<FeeAttrDto> feeAttrs;
 
@@ -77,6 +77,9 @@
     private String rate;
 
     private String rateStartTime;
+
+
+    private Date maxEndTime;
 
     public String getAmount() {
         return amount;
@@ -418,4 +421,12 @@
     public void setRateStartTime(String rateStartTime) {
         this.rateStartTime = rateStartTime;
     }
+
+    public Date getMaxEndTime() {
+        return maxEndTime;
+    }
+
+    public void setMaxEndTime(Date maxEndTime) {
+        this.maxEndTime = maxEndTime;
+    }
 }

--
Gitblit v1.8.0