From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/pojo/vo/device/DeviceVO.java | 9 +++++++--
1 files changed, 7 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 59dd119..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,6 +4,7 @@
import lombok.EqualsAndHashCode;
import java.util.List;
+import java.util.Map;
import com.moral.api.entity.Device;
import com.moral.api.entity.GovMonitorPoint;
@@ -19,8 +20,7 @@
/*
* ������
* */
- private String professionName;
-
+ private List<Map<String, Object>> professions;
/*
* ������
@@ -62,5 +62,10 @@
* */
private List<ManageAccount> operators;
+ /*
+ * ������������
+ * */
+ private Map<String, Object> town;
+
}
--
Gitblit v1.8.0