From 0d9deb18ad450dfc8939193c549ec27fd7915698 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 27 二月 2023 19:11:20 +0800
Subject: [PATCH] return fee comment

---
 java110-bean/src/main/java/com/java110/dto/meterMachine/MeterMachineDto.java |   78 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 78 insertions(+), 0 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/meterMachine/MeterMachineDto.java b/java110-bean/src/main/java/com/java110/dto/meterMachine/MeterMachineDto.java
index 183801d..79331ef 100644
--- a/java110-bean/src/main/java/com/java110/dto/meterMachine/MeterMachineDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/meterMachine/MeterMachineDto.java
@@ -17,21 +17,31 @@
  **/
 public class MeterMachineDto extends PageDto implements Serializable {
 
+    public static final String MACHINE_MODEL_RECHARGE  ="1001";//閲嶇疆妯″紡
+    public static final String MACHINE_MODEL_READ  ="2002";//璇昏〃妯″紡
+
     private String heartbeatTime;
     private String implBean;
+    private String implBeanName;
     private String address;
     private String prestoreDegrees;
     private String machineName;
+    private String machineNameLike;
     private String roomId;
     private String roomName;
+    private String roomNameLike;
     private String curReadingTime;
     private String machineModel;
     private String curDegrees;
     private String machineId;
     private String meterType;
     private String feeConfigName;
+    private String feeConfigNameLike;
     private String communityId;
     private String feeConfigId;
+
+    private double rechargeDegree;
+    private double rechargeMoney;
 
     private List<MeterMachineSpecDto> specs;
 
@@ -39,6 +49,10 @@
     private Date createTime;
 
     private String statusCd = "0";
+
+    private int readDay ;
+
+    private int readHours;
 
 
     public String getHeartbeatTime() {
@@ -185,4 +199,68 @@
     public void setSpecs(List<MeterMachineSpecDto> specs) {
         this.specs = specs;
     }
+
+    public String getImplBeanName() {
+        return implBeanName;
+    }
+
+    public void setImplBeanName(String implBeanName) {
+        this.implBeanName = implBeanName;
+    }
+
+    public String getMachineNameLike() {
+        return machineNameLike;
+    }
+
+    public void setMachineNameLike(String machineNameLike) {
+        this.machineNameLike = machineNameLike;
+    }
+
+    public String getRoomNameLike() {
+        return roomNameLike;
+    }
+
+    public void setRoomNameLike(String roomNameLike) {
+        this.roomNameLike = roomNameLike;
+    }
+
+    public String getFeeConfigNameLike() {
+        return feeConfigNameLike;
+    }
+
+    public void setFeeConfigNameLike(String feeConfigNameLike) {
+        this.feeConfigNameLike = feeConfigNameLike;
+    }
+
+    public double getRechargeDegree() {
+        return rechargeDegree;
+    }
+
+    public void setRechargeDegree(double rechargeDegree) {
+        this.rechargeDegree = rechargeDegree;
+    }
+
+    public int getReadDay() {
+        return readDay;
+    }
+
+    public void setReadDay(int readDay) {
+        this.readDay = readDay;
+    }
+
+    public int getReadHours() {
+        return readHours;
+    }
+
+    public void setReadHours(int readHours) {
+        this.readHours = readHours;
+    }
+
+    public double getRechargeMoney() {
+        return rechargeMoney;
+    }
+
+    public void setRechargeMoney(double rechargeMoney) {
+        this.rechargeMoney = rechargeMoney;
+    }
 }

--
Gitblit v1.8.0