From e2d5cb9ec12837f4d4a1a659014b96d008660396 Mon Sep 17 00:00:00 2001
From: chenlinghy <chenlinghy@cmhi.chinamobile.com>
Date: Fri, 14 Aug 2020 10:13:25 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E4=BF=AE=E6=94=B9DispodeTaks?=
 =?UTF-8?q?=E3=80=81TaskInfo=E6=95=B0=E6=8D=AE=E5=BA=93MYSQL=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5=202.=20=E4=BF=AE=E6=94=B9TaskInfo=E7=B1=BB=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0deviceId=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/dispose/pojo/entity/TaskInfo.java | 5 ++++-
 src/main/resources/mappers/DisposeTask.xml          | 1 +
 src/main/resources/mappers/TaskInfo.xml             | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dispose/pojo/entity/TaskInfo.java b/src/main/java/com/dispose/pojo/entity/TaskInfo.java
index bc697515..1388260c 100644
--- a/src/main/java/com/dispose/pojo/entity/TaskInfo.java
+++ b/src/main/java/com/dispose/pojo/entity/TaskInfo.java
@@ -39,11 +39,14 @@ public class TaskInfo implements Serializable {
     @Id
     @KeySql(useGeneratedKeys = true)
     private Long id;
-
     /**
      * The Task id.
      */
     private Long taskId;
+    /**
+     * The Device id.
+     */
+    private Long deviceId;
     /**
      * The Begin time.
      */
diff --git a/src/main/resources/mappers/DisposeTask.xml b/src/main/resources/mappers/DisposeTask.xml
index 1ee752af..2db53481 100644
--- a/src/main/resources/mappers/DisposeTask.xml
+++ b/src/main/resources/mappers/DisposeTask.xml
@@ -17,6 +17,7 @@
         <collection property="taskInfo" ofType="com.dispose.pojo.entity.TaskInfo">
             <id column="t_id" property="id"/>
             <result column="taskId" property="taskId"/>
+            <result column="t_deviceId" property="deviceId"/>
             <result column="beginTime" property="beginTime"/>
             <result column="t_endTime" property="endTime"/>
             <result column="taskAttackType" property="execAttackType"/>
diff --git a/src/main/resources/mappers/TaskInfo.xml b/src/main/resources/mappers/TaskInfo.xml
index 79842bdb..f247359d 100644
--- a/src/main/resources/mappers/TaskInfo.xml
+++ b/src/main/resources/mappers/TaskInfo.xml
@@ -8,6 +8,7 @@
         <result column="beginTime" property="beginTime"/>
         <result column="endTime" property="endTime"/>
         <result column="taskAttackType" property="execAttackType"/>
+        <result column="execAttackType" property="execAttackType"/>
         <result column="attackTypeStatus" property="attackTypeStatus"/>
         <result column="externId" property="externId"/>
         <result column="status" property="status"/>