From c7dd4a195d8d893d92c49963447cdf6486844584 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 20 Oct 2023 09:45:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into cjl
---
screen-manage/src/main/java/com/moral/api/pojo/vo/device/DeviceVO.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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..0c5f8d1 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,8 +20,7 @@
/*
* ������
* */
- private String professionName;
-
+ private List<Map<String, Object>> professions;
/*
* ������
@@ -52,9 +53,19 @@
private MonitorPoint monitorPoint;
/*
+ * ������������
+ * */
+ private GovMonitorPoint govMonitorPoint;
+
+ /*
* ���������
* */
private List<ManageAccount> operators;
+ /*
+ * ������������
+ * */
+ private Map<String, Object> town;
+
}
--
Gitblit v1.8.0