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 | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 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 d6b3ea6..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,30 +4,68 @@
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;
+import com.moral.api.entity.Version;
@Data
@EqualsAndHashCode(callSuper = false)
public class DeviceVO extends Device {
/*
- * ������
- * */
- private String professionName;
+ * ������
+ * */
+ private List<Map<String, Object>> professions;
/*
- * ������
- * */
+ * ������
+ * */
+ private String techName;
+
+ /*
+ * ���������
+ * */
+ private String detectorName;
+
+ /*
+ * ���������
+ * */
+ private String purchaserName;
+
+ /*
+ * ������
+ * */
private Organization organization;
/*
- * ���������
- * */
+ * ������������
+ * */
+ private Version version;
+
+ /*
+ * ������
+ * */
+ private MonitorPoint monitorPoint;
+
+ /*
+ * ������������
+ * */
+ private GovMonitorPoint govMonitorPoint;
+
+ /*
+ * ���������
+ * */
private List<ManageAccount> operators;
+ /*
+ * ������������
+ * */
+ private Map<String, Object> town;
}
--
Gitblit v1.8.0