From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java |   79 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java b/java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java
index 6e2734f..c423ead 100755
--- a/java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java
@@ -22,7 +22,9 @@
     private String updateTime;
     private String remark;
     private String objName;
+    private String objNameNum;
     private String receivedAmount;
+    private String payableAmount;
     private String feeYear;
     private String feeMonth;
     private String feeId;
@@ -39,19 +41,21 @@
     private String floorId;
     private String floorNum;
     private String unitId;
+    private String[] unitIds;
     private String unitNum;
     private String roomId;
     private String roomNum;
     private String carNum;
+    private String psName;
     private String contractCode;
     private String payerObjType;
     private String ownerName;
+    private String ownerId;
     private String detailId;
     private String builtUpArea;
 
     private String objCount;
     private String normalCount;
-
 
     private Date createTime;
     private String startTime;
@@ -116,6 +120,13 @@
     //绌虹疆鎴垮噺鍏嶉噾棰�
     private String vacantHousingReduction;
 
+    //璧犻�侀噾棰�
+    private String giftAmount;
+
+
+    //璐︽埛鎶垫墸閲戦
+    private String withholdAmount;
+
     //鏀惰垂鐜�
     private String chargeRate;
 
@@ -132,6 +143,7 @@
     private double curReceivedAmount;
     private double hisOweReceivedAmount;
     private double preReceivedAmount;
+    private double allHisOweReceivedAmount;
 
     private String[] configIds;
 
@@ -633,7 +645,6 @@
         this.builtUpArea = builtUpArea;
     }
 
-
     public String[] getConfigIds() {
         return configIds;
     }
@@ -697,4 +708,68 @@
     public void setYearMonth(String yearMonth) {
         this.yearMonth = yearMonth;
     }
+
+    public double getAllHisOweReceivedAmount() {
+        return allHisOweReceivedAmount;
+    }
+
+    public void setAllHisOweReceivedAmount(double allHisOweReceivedAmount) {
+        this.allHisOweReceivedAmount = allHisOweReceivedAmount;
+    }
+
+    public String getOwnerId() {
+        return ownerId;
+    }
+
+    public void setOwnerId(String ownerId) {
+        this.ownerId = ownerId;
+    }
+
+    public String getPsName() {
+        return psName;
+    }
+
+    public void setPsName(String psName) {
+        this.psName = psName;
+    }
+
+    public String getObjNameNum() {
+        return objNameNum;
+    }
+
+    public void setObjNameNum(String objNameNum) {
+        this.objNameNum = objNameNum;
+    }
+
+    public String getGiftAmount() {
+        return giftAmount;
+    }
+
+    public void setGiftAmount(String giftAmount) {
+        this.giftAmount = giftAmount;
+    }
+
+    public String getPayableAmount() {
+        return payableAmount;
+    }
+
+    public void setPayableAmount(String payableAmount) {
+        this.payableAmount = payableAmount;
+    }
+
+    public String[] getUnitIds() {
+        return unitIds;
+    }
+
+    public void setUnitIds(String[] unitIds) {
+        this.unitIds = unitIds;
+    }
+
+    public String getWithholdAmount() {
+        return withholdAmount;
+    }
+
+    public void setWithholdAmount(String withholdAmount) {
+        this.withholdAmount = withholdAmount;
+    }
 }

--
Gitblit v1.8.0