From b5e47a74ad88c453bf82fb8b870b69ac9d45503f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 06 八月 2021 16:08:51 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java b/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
old mode 100644
new mode 100755
index d7759ae..77f0b7b
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
@@ -21,6 +21,7 @@
public static final String PAYER_OBJ_TYPE_ROOM = "3333"; //鎴垮眿 6666 鏄溅浣�
public static final String PAYER_OBJ_TYPE_PARKING_SPACE = "6666";//鏄溅浣�
+ public static final String PAYER_OBJ_TYPE_CONTRACT = "7777";//鏄悎鍚�
public static final String PAYER_OBJ_TYPE_CAR = "6666";//鏄溅浣�
public static final String PAYER_OBJ_TYPE_RENTING = "9999";//鎴挎簮ID
@@ -50,6 +51,7 @@
private String receivedAmountSwitch;
private String squarePrice;
+ private String mwPrice;
private String additionalAmount;
private String state;
private String stateName;
@@ -64,6 +66,7 @@
private double feePrice;
private String payerObjType;
private String computingFormula;
+ private String computingFormulaText;
private String isDefault;
private double oweFee; // 娆犺垂閲戦
private String billType;
@@ -570,4 +573,20 @@
public void setCount(int count) {
this.count = count;
}
+
+ public String getComputingFormulaText() {
+ return computingFormulaText;
+ }
+
+ public void setComputingFormulaText(String computingFormulaText) {
+ this.computingFormulaText = computingFormulaText;
+ }
+
+ public String getMwPrice() {
+ return mwPrice;
+ }
+
+ public void setMwPrice(String mwPrice) {
+ this.mwPrice = mwPrice;
+ }
}
--
Gitblit v1.8.0