From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能

---
 java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 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
old mode 100644
new mode 100755
index d1cfab2..29d3347
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java
@@ -22,9 +22,16 @@
     public static final String BILL_TYPE_ONCE_MONTH = "005";// 涓�娆℃�ф寜鏈�
 
     public static final String DEFAULT_FEE_CONFIG = "T";
+    public static final String CUSTOME_FEE_CONFIG = "F";
 
     public static final String FEE_TYPE_CD_WATER = "888800010016";//鐢佃垂
     public static final String FEE_TYPE_CD_METER = "888800010015";//姘磋垂
+    public static final String FEE_TYPE_CD_GAS = "888800010009";//鐓ゆ皵
+    public static final String FEE_TYPE_CD_SYSTEM = "888800010000";//绯荤粺
+
+    public static final String CONFIG_ID_RENTING = "920000000000000000";//绉熻祦璐圭敤椤�
+    public static final String CONFIG_ID_GOODS = "930000000000000000";//鍟嗗搧璐圭敤椤�
+
 
 
     private String feeTypeCd;
@@ -33,8 +40,10 @@
     private String squarePrice;
     private String isDefault;
     private String configId;
+    private String[] configIds;
     private String feeFlag;
     private String feeName;
+    private String feeNameEq;
     private String startTime;
     private String endTime;
     private String curTime;
@@ -56,6 +65,7 @@
     private Date createTime;
 
     private String statusCd = "0";
+    private String computingFormulaText;
 
 
     public String getFeeTypeCd() {
@@ -227,4 +237,28 @@
     public void setValid(String valid) {
         this.valid = valid;
     }
+
+    public String getComputingFormulaText() {
+        return computingFormulaText;
+    }
+
+    public void setComputingFormulaText(String computingFormulaText) {
+        this.computingFormulaText = computingFormulaText;
+    }
+
+    public String[] getConfigIds() {
+        return configIds;
+    }
+
+    public void setConfigIds(String[] configIds) {
+        this.configIds = configIds;
+    }
+
+    public String getFeeNameEq() {
+        return feeNameEq;
+    }
+
+    public void setFeeNameEq(String feeNameEq) {
+        this.feeNameEq = feeNameEq;
+    }
 }

--
Gitblit v1.8.0