From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 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 0f1b804..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,6 +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;
@@ -30,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;
@@ -47,10 +59,13 @@
private String paymentCycle;
+ private String valid;
+
private Date createTime;
private String statusCd = "0";
+ private String computingFormulaText;
public String getFeeTypeCd() {
@@ -214,4 +229,36 @@
public void setCurTime(String curTime) {
this.curTime = curTime;
}
+
+ public String getValid() {
+ return valid;
+ }
+
+ 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