From 18d1f4bc4f4f77c8883702a00896dd99469db648 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 八月 2023 16:06:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/report/ReportFeeDto.java | 100 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 98 insertions(+), 2 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/report/ReportFeeDto.java b/java110-bean/src/main/java/com/java110/dto/report/ReportFeeDto.java
old mode 100644
new mode 100755
index 5529809..8c329a8
--- a/java110-bean/src/main/java/com/java110/dto/report/ReportFeeDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/report/ReportFeeDto.java
@@ -28,6 +28,7 @@
private String configId;
private String squarePrice;
+ private String mwPrice;
private String additionalAmount;
private String additionalAmountText;
private String state;
@@ -41,6 +42,7 @@
private double feePrice;
private String payerObjType;
private String computingFormula;
+ private String computingFormulaText;
private String isDefault;
private double oweFee; // 娆犺垂閲戦
private String billType;
@@ -60,7 +62,6 @@
private String ownerTel;
-
private Date createTime;
/**
@@ -76,7 +77,6 @@
private Date importFeeEndTime;
-
private String curDegrees;
private String preDegrees;
@@ -91,8 +91,17 @@
private String storeName;
private String storeTypeCd;
+ private String roomSubType;
+ private String roomRent;
+ private String roomArea;
+ private String payOnline;
+ private String scale;
+ private String decimalPlace;
+ private String units;
+ private Date newStartTime;
+ private Date newEndTime;
public String getAmount() {
return amount;
@@ -501,4 +510,91 @@
public void setAdditionalAmountText(String additionalAmountText) {
this.additionalAmountText = additionalAmountText;
}
+
+ public String getMwPrice() {
+ return mwPrice;
+ }
+
+ public void setMwPrice(String mwPrice) {
+ this.mwPrice = mwPrice;
+ }
+
+ public String getRoomSubType() {
+ return roomSubType;
+ }
+
+ public void setRoomSubType(String roomSubType) {
+ this.roomSubType = roomSubType;
+ }
+
+ public String getRoomRent() {
+ return roomRent;
+ }
+
+ public void setRoomRent(String roomRent) {
+ this.roomRent = roomRent;
+ }
+
+ public String getRoomArea() {
+ return roomArea;
+ }
+
+ public void setRoomArea(String roomArea) {
+ this.roomArea = roomArea;
+ }
+
+ 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 getComputingFormulaText() {
+ return computingFormulaText;
+ }
+
+ public void setComputingFormulaText(String computingFormulaText) {
+ this.computingFormulaText = computingFormulaText;
+ }
+ public Date getNewStartTime() {
+ return newStartTime;
+ }
+
+ public void setNewStartTime(Date newStartTime) {
+ this.newStartTime = newStartTime;
+ }
+
+ public Date getNewEndTime() {
+ return newEndTime;
+ }
+
+ public void setNewEndTime(Date newEndTime) {
+ this.newEndTime = newEndTime;
+ }
}
--
Gitblit v1.8.0