diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java
index df83af0..bbf573a 100644
--- a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java
+++ b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ExperDevVo.java
@@ -4,6 +4,7 @@ import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 
 /**
@@ -20,6 +21,10 @@ public class ExperDevVo {
     private Long id;
     /**试验表id	*/
     private Long experId;
+
+    @NotNull(message = "收样设备id不能为空", groups = {Query.class})
+    private Long devId;
+
     /**客户自编号*/
     @NotBlank(message = "客户自编号不能为空", groups = {Query.class})
     @Length(max = 32, message = "编号字符长度不能超过32", groups = {Query.class})
@@ -53,6 +58,9 @@ public class ExperDevVo {
     @Length(max = 256, message = "备注字符长度不能超过256", groups = {Query.class})
     private String remarks;
 
+    /*是否合格*/
+    private String isHg;
+
     public interface Query {
     }
 
diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
index 1d85d05..8422178 100644
--- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
@@ -275,11 +275,9 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
         try {
             JSONObject obj = JSONObject.parseObject(vo.getParamsData());
             JSONArray yjList = obj.getJSONArray("yjList");
-            JSONArray devList = obj.getJSONArray("devList");
             JSONArray mainDevList = obj.getJSONArray("mainDevList");
             JSONArray itemsList = obj.getJSONArray("items");
             List<ExperBasisVo> basisVos = yjList.toJavaList(ExperBasisVo.class);
-            List<ConfigDevVo> deviceVos = devList.toJavaList(ConfigDevVo.class);
             List<ConfigMainDevVo> mainDeviceVos = mainDevList.toJavaList(ConfigMainDevVo.class);
             List<ConfigItemsVo> configItemsVos = itemsList.toJavaList(ConfigItemsVo.class);
             for (ConfigItemsVo configItemsVo : configItemsVos) {
@@ -288,7 +286,6 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
                 configItemsVo.setItemList(configItemVos);
             }
             vo.setBasisVos(basisVos);
-            vo.setDeviceVos(deviceVos);
             vo.setMainDeviceVos(mainDeviceVos);
             vo.setConfigItemsVos(configItemsVos);
         } catch (Exception e) {
diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java
index c3244b3..c3ceb97 100644
--- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java
@@ -390,12 +390,10 @@ public class ExperimentalServiceImpl implements ExperimentalService {
         try {
             JSONObject obj = JSONObject.parseObject(vo.getParamsData());
             JSONArray yjList = obj.getJSONArray("yjList");
-            JSONArray devList = obj.getJSONArray("devList");
             JSONArray mainDevList = obj.getJSONArray("mainDevList");
             JSONArray itemsList = obj.getJSONArray("items");
             JSONArray experDevList = obj.getJSONArray("experDevList");
             List<ExperBasisVo> basisVos = yjList.toJavaList(ExperBasisVo.class);
-            List<ConfigDevVo> deviceVos = devList.toJavaList(ConfigDevVo.class);
             List<ConfigMainDevVo> mainDeviceVos = mainDevList.toJavaList(ConfigMainDevVo.class);
             List<ConfigItemsVo> configItemsVos = itemsList.toJavaList(ConfigItemsVo.class);
             List<ExperDevVo> experDevVos = experDevList.toJavaList(ExperDevVo.class);
@@ -411,7 +409,6 @@ public class ExperimentalServiceImpl implements ExperimentalService {
                 vo.setCheckTime(mainDeviceVo.getDevContractDate());
             }
             vo.setBasisVos(basisVos);
-            vo.setDeviceVos(deviceVos);
             vo.setMainDeviceVos(mainDeviceVos);
             vo.setConfigItemsVos(configItemsVos);
             vo.setExperDevVos(experDevVos);