From 4e7907983a99e695f2acba4dec8bd73b7dbe6b2b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 14:41:33 +0800
Subject: [PATCH] optimize

---
 java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 56 insertions(+), 4 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 e1f26dd..b72f642 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,20 +29,23 @@
     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";//鍟嗗搧璐圭敤椤�
 
     public static final String COMPUTING_FORMULA_TEMP_CAR = "9999";
     public static final String COMPUTING_FORMULA_RANT_RATE = "1102"; // 绉熼噾閫掑
+    public static final String COMPUTING_FORMULA_DYNAMIC = "4004"; // 绉熼噾閫掑
 
     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;
@@ -74,9 +77,14 @@
     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;
 
 
     public String getFeeTypeCd() {
@@ -281,7 +289,51 @@
         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;
+    }
 }

--
Gitblit v1.8.0