From 08d8b029b10706b135713424e9b2a1b6e3839372 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期日, 23 八月 2020 22:40:01 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java |  128 +++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 125 insertions(+), 3 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java b/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
index 88c70ea..d8a9f01 100644
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
@@ -15,6 +15,14 @@
  **/
 public class FeeDto extends PageDto implements Serializable {
 
+    public static final String STATE_FINISH = "2009001"; // 鏀惰垂缁撴潫
+    public static final String STATE_DOING = "2008001"; // 鏀惰垂涓�
+
+    public static final String PAYER_OBJ_TYPE_ROOM = "3333"; //鎴垮眿 6666 鏄溅浣�
+    public static final String PAYER_OBJ_TYPE_PARKING_SPACE = "6666";//鏄溅浣�
+
+    public static final String FEE_FLAG_ONCE = "2006012";
+
     private String amount;
     private String incomeObjId;
     private String feeTypeCd;
@@ -24,6 +32,7 @@
     private String feeId;
     private String userId;
     private String payerObjId;
+    private String payerObjName;
     private String[] payerObjIds;
     private String[] feeTypeCds;
     private String configId;
@@ -44,6 +53,24 @@
     private String payerObjType;
     private String computingFormula;
     private String isDefault;
+    private double oweFee; // 娆犺垂閲戦
+    private String billType;
+    private String billTypeName;
+
+    private String paymentCd;
+
+    private String paymentCycle;
+
+    private String bId;
+    private String importFeeName;
+
+    private String amountOwed;
+
+    private String roomName;
+
+    private String ownerName;
+
+    private String ownerTel;
 
 
     private Date createTime;
@@ -53,12 +80,11 @@
     /**
      * 璐圭敤椤瑰紑濮嬫椂闂�
      */
-    private  Date configStartTime;
+    private Date configStartTime;
     /**
      * 璐圭敤椤圭粨鏉熸椂闂�
      */
-    private Date  configEndTime;
-
+    private Date configEndTime;
 
 
     public String getAmount() {
@@ -302,4 +328,100 @@
     public void setConfigEndTime(Date configEndTime) {
         this.configEndTime = configEndTime;
     }
+
+    public String getPaymentCd() {
+        return paymentCd;
+    }
+
+    public void setPaymentCd(String paymentCd) {
+        this.paymentCd = paymentCd;
+    }
+
+    public String getPaymentCycle() {
+        return paymentCycle;
+    }
+
+    public void setPaymentCycle(String paymentCycle) {
+        this.paymentCycle = paymentCycle;
+    }
+
+    public double getOweFee() {
+        return oweFee;
+    }
+
+    public void setOweFee(double oweFee) {
+        this.oweFee = oweFee;
+    }
+
+    public String getPayerObjName() {
+        return payerObjName;
+    }
+
+    public void setPayerObjName(String payerObjName) {
+        this.payerObjName = payerObjName;
+    }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
+
+    public String getBillType() {
+        return billType;
+    }
+
+    public void setBillType(String billType) {
+        this.billType = billType;
+    }
+
+    public String getBillTypeName() {
+        return billTypeName;
+    }
+
+    public void setBillTypeName(String billTypeName) {
+        this.billTypeName = billTypeName;
+    }
+
+    public String getImportFeeName() {
+        return importFeeName;
+    }
+
+    public void setImportFeeName(String importFeeName) {
+        this.importFeeName = importFeeName;
+    }
+
+    public String getAmountOwed() {
+        return amountOwed;
+    }
+
+    public void setAmountOwed(String amountOwed) {
+        this.amountOwed = amountOwed;
+    }
+
+    public String getRoomName() {
+        return roomName;
+    }
+
+    public void setRoomName(String roomName) {
+        this.roomName = roomName;
+    }
+
+    public String getOwnerName() {
+        return ownerName;
+    }
+
+    public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName;
+    }
+
+    public String getOwnerTel() {
+        return ownerTel;
+    }
+
+    public void setOwnerTel(String ownerTel) {
+        this.ownerTel = ownerTel;
+    }
 }

--
Gitblit v1.8.0