From 4aaab689ed4e94dd9e34ec22c661b3227befe8a8 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 27 四月 2022 18:25:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/domain/LightPoleHeeling.java | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/LightPoleHeeling.java b/dao/src/main/java/com/sandu/ximon/dao/domain/LightPoleHeeling.java
index 3671e4b..61f32f5 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/LightPoleHeeling.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/LightPoleHeeling.java
@@ -19,32 +19,17 @@
*
*/
@TableId(type = IdType.AUTO)
- private Long id;
+ private Long warningNumber;
/**
- * 鎵�灞炰汉
+ * 璁惧MAC鍦板潃
*/
- private Long userId;
-
- /**
- * 鍛婅鍙�
- */
- private String warningNumber;
-
- /**
- * 鐏潌ID
- */
- private Long lightPoleId;
-
- /**
- * 鐏潌鍚嶇О
- */
- private String lightPoleName;
+ private String mac;
/**
* 璀﹀憡绛夌骇
*/
- private String warningLevel;
+ private Integer warningLevel;
/**
* X杞�
@@ -71,6 +56,18 @@
*/
private LocalDateTime createTime;
+ /**
+ * 鐏潌缂栧彿
+ */
+ @TableField(exist = false)
+ private Long poleCode;
+
+ /**
+ * 鐏潌鍚嶇О
+ */
+ @TableField(exist = false)
+ private String poleName;
+
@TableField(exist = false)
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
--
Gitblit v1.9.3