From 8b0dd174285faed9afdd7341a177df4e60d98192 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 25 八月 2023 01:56:25 +0800
Subject: [PATCH] 优化代码

---
 java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java |  161 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 156 insertions(+), 5 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java b/java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java
index f64cf1d..66275bb 100755
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java
@@ -29,7 +29,7 @@
     public static final String FEE_TYPE_CD_GAS = "888800010009";//鐓ゆ皵
     public static final String FEE_TYPE_CD_SYSTEM = "888800010000";//绯荤粺
     public static final String FEE_TYPE_CD_PARKING = "888800010008";//绯荤粺
-
+    public static final String FEE_TYPE_CD_RENT = "888800010018";// 绉熼噾
     public static final String CONFIG_ID_RENTING = "920000000000000000";//绉熻祦璐圭敤椤�
     public static final String CONFIG_ID_GOODS = "930000000000000000";//鍟嗗搧璐圭敤椤�
 
@@ -40,10 +40,12 @@
     public static final String PAYMENT_CD_PRE = "1200";
     public static final String PAYMENT_CD_AFTER = "2100";
 
+    public static final String DEDUCT_FROM_N = "N";
 
 
     private String feeTypeCd;
     private String computingFormula;
+    private String computingFormulaName;
     private String additionalAmount;
     private String squarePrice;
     private String isDefault;
@@ -51,6 +53,8 @@
     private String[] configIds;
     private String feeFlag;
     private String feeName;
+
+    private String feeNameLike;
     private String feeNameEq;
     private String startTime;
     private String endTime;
@@ -69,15 +73,37 @@
 
     private String valid;
 
-
     private Date createTime;
 
     private String statusCd = "0";
     private String computingFormulaText;
 
-    private String deductFrom = "Y";
+    private String deductFrom;
 
     private double amount;
+
+    private String payOnline;
+    private String scale;
+    private String decimalPlace;
+    private String units;
+
+    private String bId;
+    private String operate;
+
+    private String userName;
+
+    private String payerObjType;
+
+
+    private String deleteFlag;
+
+
+    private String prepaymentPeriod;
+
+    private String staffNameLike;
+
+    private String logStartTime;
+    private String logEndTime;
 
 
     public String getFeeTypeCd() {
@@ -282,7 +308,132 @@
         this.amount = amount;
     }
 
-    public String getDeductFrom() { return deductFrom; }
+    public String getDeductFrom() {
+        return deductFrom;
+    }
 
-    public void setDeductFrom(String deductFrom) { this.deductFrom = deductFrom; }
+    public void setDeductFrom(String deductFrom) {
+        this.deductFrom = deductFrom;
+    }
+
+    public String getComputingFormulaName() {
+        return computingFormulaName;
+    }
+
+    public void setComputingFormulaName(String computingFormulaName) {
+        this.computingFormulaName = computingFormulaName;
+    }
+
+    public String getPayOnline() {
+        return payOnline;
+    }
+
+    public void setPayOnline(String payOnline) {
+        this.payOnline = payOnline;
+    }
+
+    public String getScale() {
+        return scale;
+    }
+
+    public void setScale(String scale) {
+        this.scale = scale;
+    }
+
+    public String getDecimalPlace() {
+        return decimalPlace;
+    }
+
+    public void setDecimalPlace(String decimalPlace) {
+        this.decimalPlace = decimalPlace;
+    }
+
+    public String getUnits() {
+        return units;
+    }
+
+    public void setUnits(String units) {
+        this.units = units;
+    }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
+
+    public String getOperate() {
+        return operate;
+    }
+
+    public void setOperate(String operate) {
+        this.operate = operate;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getPayerObjType() {
+        return payerObjType;
+    }
+
+    public void setPayerObjType(String payerObjType) {
+        this.payerObjType = payerObjType;
+    }
+
+
+    public String getDeleteFlag() {
+        return deleteFlag;
+    }
+
+    public void setDeleteFlag(String deleteFlag) {
+        this.deleteFlag = deleteFlag;
+    }
+    public String getPrepaymentPeriod() {
+        return prepaymentPeriod;
+    }
+
+    public void setPrepaymentPeriod(String prepaymentPeriod) {
+        this.prepaymentPeriod = prepaymentPeriod;
+
+    }
+
+    public String getStaffNameLike() {
+        return staffNameLike;
+    }
+
+    public void setStaffNameLike(String staffNameLike) {
+        this.staffNameLike = staffNameLike;
+    }
+
+    public String getFeeNameLike() {
+        return feeNameLike;
+    }
+
+    public void setFeeNameLike(String feeNameLike) {
+        this.feeNameLike = feeNameLike;
+    }
+
+    public String getLogStartTime() {
+        return logStartTime;
+    }
+
+    public void setLogStartTime(String logStartTime) {
+        this.logStartTime = logStartTime;
+    }
+
+    public String getLogEndTime() {
+        return logEndTime;
+    }
+
+    public void setLogEndTime(String logEndTime) {
+        this.logEndTime = logEndTime;
+    }
 }

--
Gitblit v1.8.0