From 39c6e9b5e6006053d42c0c8d4dc777add9257ae6 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 11 May 2021 15:20:18 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/entity/Sensor.java | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/Sensor.java b/screen-manage/src/main/java/com/moral/api/entity/Sensor.java
index 2a9209a..1c37b3a 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/Sensor.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/Sensor.java
@@ -1,10 +1,13 @@
package com.moral.api.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import java.io.Serializable;
+import java.util.Date;
+
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -14,7 +17,7 @@
* </p>
*
* @author moral
- * @since 2021-05-06
+ * @since 2021-05-08
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -36,42 +39,29 @@
/**
* ���������������������������
*/
- private String sensorKey;
+ @TableField(value = "`desc`")
+ private String desc;
/**
- * ������������
+ * ������������������
*/
- private String unit;
-
- /**
- * ���������
- */
- private Double upper;
-
- /**
- * ���������
- */
- private Double lower;
+ @TableField(value = "`code`")
+ private String code;
/**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* ������������
*/
private String isDelete;
-
- /**
- * ������
- */
- private String desc;
@Override
--
Gitblit v1.8.0