From bec2ef3f7b137304e2188683cc3239716a597e79 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 09 一月 2020 11:59:49 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/FeeDto.java |  122 +++++++++++++++++++++++++++++-----------
 1 files changed, 89 insertions(+), 33 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/FeeDto.java b/java110-bean/src/main/java/com/java110/dto/FeeDto.java
index 18a709a..595762b 100644
--- a/java110-bean/src/main/java/com/java110/dto/FeeDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/FeeDto.java
@@ -14,14 +14,20 @@
 public class FeeDto extends PageDto implements Serializable {
 
     private String amount;
-private String incomeObjId;
-private String feeTypeCd;
-private String startTime;
-private String endTime;
-private String communityId;
-private String feeId;
-private String userId;
-private String payerObjId;
+    private String incomeObjId;
+    private String feeTypeCd;
+    private Date startTime;
+    private Date endTime;
+    private String communityId;
+    private String feeId;
+    private String userId;
+    private String payerObjId;
+    private String[] feeTypeCds;
+
+    private String squarePrice;
+    private String additionalAmount;
+
+    private Date arrearsEndTime;
 
 
     private Date createTime;
@@ -32,55 +38,56 @@
     public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getIncomeObjId() {
+
+    public String getIncomeObjId() {
         return incomeObjId;
     }
-public void setIncomeObjId(String incomeObjId) {
+
+    public void setIncomeObjId(String incomeObjId) {
         this.incomeObjId = incomeObjId;
     }
-public String getFeeTypeCd() {
+
+    public String getFeeTypeCd() {
         return feeTypeCd;
     }
-public void setFeeTypeCd(String feeTypeCd) {
+
+    public void setFeeTypeCd(String feeTypeCd) {
         this.feeTypeCd = feeTypeCd;
     }
-public String getStartTime() {
-        return startTime;
-    }
-public void setStartTime(String startTime) {
-        this.startTime = startTime;
-    }
-public String getEndTime() {
-        return endTime;
-    }
-public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
-public String getUserId() {
+
+    public String getUserId() {
         return userId;
     }
-public void setUserId(String userId) {
+
+    public void setUserId(String userId) {
         this.userId = userId;
     }
-public String getPayerObjId() {
+
+    public String getPayerObjId() {
         return payerObjId;
     }
-public void setPayerObjId(String payerObjId) {
+
+    public void setPayerObjId(String payerObjId) {
         this.payerObjId = payerObjId;
     }
 
@@ -100,4 +107,53 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+
+    public Date getArrearsEndTime() {
+        return arrearsEndTime;
+    }
+
+    public void setArrearsEndTime(Date arrearsEndTime) {
+        this.arrearsEndTime = arrearsEndTime;
+    }
+
+    public String[] getFeeTypeCds() {
+        return feeTypeCds;
+    }
+
+    public void setFeeTypeCds(String[] feeTypeCds) {
+        this.feeTypeCds = feeTypeCds;
+    }
+
+    public String getSquarePrice() {
+        return squarePrice;
+    }
+
+    public void setSquarePrice(String squarePrice) {
+        this.squarePrice = squarePrice;
+    }
+
+    public String getAdditionalAmount() {
+        return additionalAmount;
+    }
+
+    public void setAdditionalAmount(String additionalAmount) {
+        this.additionalAmount = additionalAmount;
+    }
 }

--
Gitblit v1.8.0