From bfce748e37a753c729e15dd233600379f504d019 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 13:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/vo/PoleBindVO.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/PoleBindVO.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/PoleBindVO.java
index 9fec125..161cc26 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/PoleBindVO.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/PoleBindVO.java
@@ -1,5 +1,7 @@
package com.sandu.ximon.admin.vo;
+import com.sandu.ximon.admin.dto.WaterQualityDataDto;
+import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import com.sandu.ximon.dao.domain.*;
import lombok.Data;
@@ -12,13 +14,13 @@
public class PoleBindVO {
- private Pole pole;
+ private Pole pole; //
/**
* 澶ф皵鐩戞祴
*/
- private AirMonitoring airMonitoring;
+ private AirEquipment airMonitoring; //
/**
* ip闊虫煴
@@ -28,23 +30,23 @@
/**
* 鍏呯數妗�
*/
- private C3mCharging c3mCharging;
+ private C3mCharging c3mCharging; //
/**
* 璺伅
*/
- private Light light;
+ private Light light; //
/**
* 鏉嗕綋鍊炬祴
*/
- private LightPoleHeeling lightPoleHeeling;
+ private LightPoleHeeling lightPoleHeeling; //
/**
* 鎽勫儚澶�
*/
- private Monitor monitor;
+ private YSY_MonitorDto.MonitorDto monitor; //
/**
* LED璇虹摝
@@ -59,5 +61,5 @@
/**
* 姘磋川鐩戞祴
*/
- private WaterMonitoring waterMonitoring;
+ private WaterQualityDataDto waterMonitoring;
}
--
Gitblit v1.9.3