From 9a87635a1599787948c2f6d1d8086df0730f3b2d Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 08 Jun 2021 14:05:55 +0800
Subject: [PATCH] screen-manage 修改编辑账号功能BUG
---
screen-manage/src/main/java/com/moral/api/entity/Sensor.java | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 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..7d9b70f 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,47 +39,49 @@
/**
* ���������������������������
*/
- private String sensorKey;
+ @TableField(value = "`desc`")
+ private String desc;
/**
- * ������������
+ * ������������������
*/
- private String unit;
+ @TableField(value = "`code`")
+ private String code;
/**
- * ���������
+ * ������
*/
private Double upper;
/**
- * ���������
+ * ������
*/
private Double lower;
/**
+ * ������������
+ */
+ private String defaultUnitKey;
+
+ /**
* ������������
*/
- private LocalDateTime createTime;
+ private Date createTime;
/**
* ������������
*/
- private LocalDateTime updateTime;
+ private Date updateTime;
/**
* ������������
*/
private String isDelete;
- /**
- * ������
- */
- private String desc;
+ @TableField(exist = false)
+ private String unit;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
+ @TableField(exist = false)
+ private String unitKey;
}
--
Gitblit v1.8.0