From 161ec503806c8b71f5caa2d42c2fa9c03ca062d6 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 28 二月 2022 15:17:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/domain/Light.java | 52 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java b/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
index 772ba3f..50ec96d 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/Light.java
@@ -1,34 +1,56 @@
package com.sandu.ximon.dao.domain;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-import org.apache.ibatis.annotations.Lang;
-
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.time.LocalDateTime;
+import lombok.Data;
+/**
+ * 璺伅琛�
+ * @TableName light
+ */
+@TableName(value ="light")
@Data
public class Light implements Serializable {
-
+ /**
+ *
+ */
@TableId(type = IdType.AUTO)
- private Long id;
+ private Long lightId;
- private Long userId;
+ /**
+ * 璁惧璇嗗埆鐮�
+ */
+ private String deviceCode;
- private String kind;
+ /**
+ * 澶囨敞淇℃伅
+ */
+ private String remark;
- private String size;
+ /**
+ * 鐏�1浜害鐧惧垎姣旓紝0-100
+ */
+ private Integer lightPercent;
- private String name;
+ /**
+ * 鐏�2浜害鐧惧垎姣旓紝0-100
+ */
+ private Integer light2Percent;
- private String macId;
-
- private String state;
-
- private Long lampId;
-
+ /**
+ * 鍒涘缓鏃堕棿
+ */
private LocalDateTime createTime;
+ /**
+ *
+ */
+ private LocalDateTime updateTime;
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
}
--
Gitblit v1.9.3