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/AirEquipment.java |   30 ++++++++----------------------
 1 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java b/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
index 4b5fcaf..97f09af 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
@@ -4,32 +4,25 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
 import lombok.Data;
 
 /**
  * 澶ф皵璁惧
+ *
  * @TableName air_equipment
  */
-@TableName(value ="air_equipment")
+@TableName(value = "air_equipment")
 @Data
 public class AirEquipment implements Serializable {
     /**
-     * 
+     *
      */
     @TableId(type = IdType.AUTO)
     private Long id;
-
-    /**
-     * 鎵�灞炵伅鏉�
-     */
-    private String belongTo;
-
-    /**
-     * 澶ф皵璁惧鐘舵��:鍦ㄧ嚎:1/绂荤嚎:0
-     */
-    private Integer equipmentState;
 
     /**
      * 鎺ュ叆鏃堕棿
@@ -37,20 +30,13 @@
     private LocalDateTime createTime;
 
     /**
-     * 鎵�灞炰汉
-     */
-    private Long userId;
-
-    /**
-     * 鐏潌ID
-     */
-    private String lightPoleId;
-
-    /**
      * MAC鍦板潃
      */
     private String mac;
 
     @TableField(exist = false)
+    private Integer state;
+
+    @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

--
Gitblit v1.9.3