From 154bba4b3b898bbb7ef048211283fc2b176a8900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Fri, 1 Nov 2019 19:59:05 +0800
Subject: [PATCH] =?UTF-8?q?LAC=20=E8=B0=83=E5=BA=A6=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java   | 7 ++++---
 .../main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java   | 7 +++++++
 .../src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java         | 2 ++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java
index af6e6fb..c821de0 100644
--- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java
+++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacSuitCase.java
@@ -1,15 +1,12 @@
 package cn.estsh.i3plus.pojo.lac.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
@@ -76,6 +73,10 @@ public class LacSuitCase extends BaseBean {
     @ApiParam(value ="硬件类型")
     private Integer hardwareType;
 
+    @Column(name="SOFTWARE_SUIT_CODE")
+    @ApiParam(value ="软适配代码")
+    private String softwareSuitCode;
+
     @Column(name="RETURN_METHOD")
     @ApiParam(value ="返回类型")
     private Integer returnMethod;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java
index 75964e5..005846b 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacSuitRequest.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.lac;
 
+import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
 import java.util.List;
@@ -25,4 +26,10 @@ public class LacSuitRequest {
      */
     private List<Task> taskList;
 
+    /**
+     * 指令集代码
+     */
+    @XStreamCDATA
+    private String paramList;
+
 }
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java
index 839e2e3..05d5dab 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/Task.java
@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.lac;
 
+import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;
 
@@ -16,5 +17,6 @@ public class Task {
 
     private String code;
 
+    @XStreamCDATA
     private Object paramList;
 }