From c916ff0469b962ec3b1a1d9b97bb75415946f73d Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Wed, 24 Jan 2024 09:01:09 +0800
Subject: [PATCH] 2024-01-24 09:01:02

---
 .../src/main/java/com/dky/entity/OriginalDevice.java   | 10 +++++-----
 dntd-tool/pom.xml                                      |  2 +-
 dntd-tool/src/main/java/com/dky/tool/ModelTool.java    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dntd-model-heatboiler/src/main/java/com/dky/entity/OriginalDevice.java b/dntd-model-heatboiler/src/main/java/com/dky/entity/OriginalDevice.java
index c5b7932..126f986 100644
--- a/dntd-model-heatboiler/src/main/java/com/dky/entity/OriginalDevice.java
+++ b/dntd-model-heatboiler/src/main/java/com/dky/entity/OriginalDevice.java
@@ -4,7 +4,7 @@ public class OriginalDevice {
     private int equipmentType; // 设备类型（1锅炉，2窑炉，3灶台）
     private int quantity; // 台数（台）
     private int energyType; // 能源类型（1煤，2油，3气）
-    private double previousYearOperatingCost; // 上年运行费用（万元）
+    private double lastYearFee; // 上年运行费用（万元）
     private double substituteBeforeEnergyConsumption; // 替代前年能源用量
     private double electricityPrice; // 执行电价（万元）
 
@@ -35,12 +35,12 @@ public class OriginalDevice {
         this.energyType = energyType;
     }
 
-    public double getPreviousYearOperatingCost() {
-        return previousYearOperatingCost;
+    public double getLastYearFee() {
+        return lastYearFee;
     }
 
-    public void setPreviousYearOperatingCost(double previousYearOperatingCost) {
-        this.previousYearOperatingCost = previousYearOperatingCost;
+    public void setLastYearFee(double lastYearFee) {
+        this.lastYearFee = lastYearFee;
     }
 
     public double getSubstituteBeforeEnergyConsumption() {
diff --git a/dntd-tool/pom.xml b/dntd-tool/pom.xml
index 7ef0014..67d4846 100644
--- a/dntd-tool/pom.xml
+++ b/dntd-tool/pom.xml
@@ -13,7 +13,7 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>8</maven.compiler.source>z
+        <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/dntd-tool/src/main/java/com/dky/tool/ModelTool.java b/dntd-tool/src/main/java/com/dky/tool/ModelTool.java
index e60b0e3..394f48b 100644
--- a/dntd-tool/src/main/java/com/dky/tool/ModelTool.java
+++ b/dntd-tool/src/main/java/com/dky/tool/ModelTool.java
@@ -16,7 +16,7 @@ import java.util.*;
 public class ModelTool {
     public static List<DevSpec> specList = new ArrayList<>();
     public static List<DevPrice> priceList = new ArrayList<>();
-    //制热锅炉，单功率单价，单位。建缓冲区。List实体。
+    // 制热锅炉，单功率单价，单位。建缓冲区。List实体。
     public ModelTool(JSONObject list) {
 
         JSONArray specArray = list.getJSONArray("devSpecList");