From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskRelationVO.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskRelationVO.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskRelationVO.java
index 91a4d4a..26f558d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskRelationVO.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LightTaskRelationVO.java
@@ -1,7 +1,5 @@
package com.sandu.ximon.admin.vo;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.sandu.ximon.dao.domain.LightTask;
import lombok.Data;
/**
@@ -11,8 +9,8 @@
@Data
public class LightTaskRelationVO {
- private Long poleId;
-
+ private Long poleId;
+ private String poleName;
private String lightAddress;
--
Gitblit v1.9.3