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/returnPayFee/ReturnPayFeeDto.java |   95 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/returnPayFee/ReturnPayFeeDto.java b/java110-bean/src/main/java/com/java110/dto/returnPayFee/ReturnPayFeeDto.java
index 0b8cb3b..b5d7749 100755
--- a/java110-bean/src/main/java/com/java110/dto/returnPayFee/ReturnPayFeeDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/returnPayFee/ReturnPayFeeDto.java
@@ -1,9 +1,12 @@
 package com.java110.dto.returnPayFee;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.feeAccountDetail.FeeAccountDetailDto;
+import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -14,6 +17,8 @@
  * add by wuxw 2019/4/24
  **/
 public class ReturnPayFeeDto extends PageDto implements Serializable {
+
+    public static final String STATE_WAIT = "1000";
 
     private String reason;
     private String primeRate;
@@ -30,8 +35,9 @@
     private String state;
     private String communityId;
 
-
     private String createTime;
+    private String startTime;
+    private String endTime;
 
     private String statusCd = "0";
     private String feeTypeCdName;
@@ -52,6 +58,20 @@
     private String paNum;
 
     private String payerObjType;
+    private String payerObjName;
+
+    //alter table return_pay_fee add COLUMN apply_person_id varchar(30) comment '鐢宠浜篒D';
+    //alter table return_pay_fee add COLUMN apply_person_name varchar(30) comment '鐢宠浜�';
+    //
+    //alter table return_pay_fee add COLUMN audit_person_id varchar(30) comment '瀹℃牳浜篒D';
+    //alter table return_pay_fee add COLUMN audit_person_name varchar(30) comment '瀹℃牳浜�';
+    private String applyPersonId;
+    private String applyPersonName;
+    private String auditPersonId;
+    private String auditPersonName;
+
+    private List<FeeAccountDetailDto> feeAccountDetailDtoList;
+    private List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtoList;
 
     public String getReason() {
         return reason;
@@ -164,7 +184,6 @@
     public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-
 
     public String getCreateTime() {
         return createTime;
@@ -301,4 +320,76 @@
     public void setPayerObjType(String payerObjType) {
         this.payerObjType = payerObjType;
     }
+
+    public String getPayerObjName() {
+        return payerObjName;
+    }
+
+    public void setPayerObjName(String payerObjName) {
+        this.payerObjName = payerObjName;
+    }
+
+    public List<FeeAccountDetailDto> getFeeAccountDetailDtoList() {
+        return feeAccountDetailDtoList;
+    }
+
+    public void setFeeAccountDetailDtoList(List<FeeAccountDetailDto> feeAccountDetailDtoList) {
+        this.feeAccountDetailDtoList = feeAccountDetailDtoList;
+    }
+
+    public List<PayFeeDetailDiscountDto> getPayFeeDetailDiscountDtoList() {
+        return payFeeDetailDiscountDtoList;
+    }
+
+    public void setPayFeeDetailDiscountDtoList(List<PayFeeDetailDiscountDto> payFeeDetailDiscountDtoList) {
+        this.payFeeDetailDiscountDtoList = payFeeDetailDiscountDtoList;
+    }
+
+    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 getApplyPersonId() {
+        return applyPersonId;
+    }
+
+    public void setApplyPersonId(String applyPersonId) {
+        this.applyPersonId = applyPersonId;
+    }
+
+    public String getApplyPersonName() {
+        return applyPersonName;
+    }
+
+    public void setApplyPersonName(String applyPersonName) {
+        this.applyPersonName = applyPersonName;
+    }
+
+    public String getAuditPersonId() {
+        return auditPersonId;
+    }
+
+    public void setAuditPersonId(String auditPersonId) {
+        this.auditPersonId = auditPersonId;
+    }
+
+    public String getAuditPersonName() {
+        return auditPersonName;
+    }
+
+    public void setAuditPersonName(String auditPersonName) {
+        this.auditPersonName = auditPersonName;
+    }
 }

--
Gitblit v1.8.0