From 4450dd41e8d5828e5da4d277c86e54551a6b6c15 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 16 Dec 2021 09:06:28 +0800
Subject: [PATCH] 设备新增,修改是工艺字段可以为多个,修改mapper,sql

---
 screen-manage/src/main/java/com/moral/api/pojo/vo/device/DeviceVO.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/device/DeviceVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/device/DeviceVO.java
index ffb4c28..eb1404c 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/device/DeviceVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/device/DeviceVO.java
@@ -4,8 +4,10 @@
 import lombok.EqualsAndHashCode;
 
 import java.util.List;
+import java.util.Map;
 
 import com.moral.api.entity.Device;
+import com.moral.api.entity.GovMonitorPoint;
 import com.moral.api.entity.ManageAccount;
 import com.moral.api.entity.MonitorPoint;
 import com.moral.api.entity.Organization;
@@ -18,7 +20,7 @@
     /*
      * ������
      * */
-    private String professionName;
+    private List<Map<String, Object>> professions;
 
 
     /*
@@ -52,6 +54,11 @@
     private MonitorPoint monitorPoint;
 
     /*
+     * ������������
+     * */
+    private GovMonitorPoint govMonitorPoint;
+
+    /*
      * ���������
      * */
     private List<ManageAccount> operators;

--
Gitblit v1.8.0