From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/meterMachine/MeterMachineDto.java |   19 +++++++++++++++++++
 1 files changed, 19 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 3e775d6..ba3ba91 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
@@ -41,6 +41,9 @@
     private String feeConfigId;
 
     private double rechargeDegree;
+    private double rechargeMoney;
+
+    private String degree;
 
     private List<MeterMachineSpecDto> specs;
 
@@ -254,4 +257,20 @@
     public void setReadHours(int readHours) {
         this.readHours = readHours;
     }
+
+    public double getRechargeMoney() {
+        return rechargeMoney;
+    }
+
+    public void setRechargeMoney(double rechargeMoney) {
+        this.rechargeMoney = rechargeMoney;
+    }
+
+    public String getDegree() {
+        return degree;
+    }
+
+    public void setDegree(String degree) {
+        this.degree = degree;
+    }
 }

--
Gitblit v1.8.0