From bd22b4dd8b1ad34c37d3d30e499bb030ccec73b6 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Tue, 22 Nov 2022 15:07:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=8F=91=E6=B3=A1?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=AE=9E=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/system/domain/scada/OrderInfo.java  | 2 ++
 .../src/main/resources/mapper/system/ImosPrPlanMapper.xml       | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/scada/OrderInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/scada/OrderInfo.java
index c83a934..c5d23fe 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/scada/OrderInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/scada/OrderInfo.java
@@ -31,4 +31,6 @@ public class OrderInfo {
     private Date endTime;
 
     private String planDate;
+
+    private String deviceState,deviceID;
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml
index 76d2e16..4273df1 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml
@@ -13,6 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="endTime" column="end_time" />
         <result property="planDate" column="plan_date"/>
         <result property="target" column="target"/>
+        <result property="deviceID" column="deviceID"/>
+        <result property="deviceState" column="deviceState"/>
     </resultMap>
     
     <resultMap type="ImosPrPlan" id="ImosPrPlanResult">