From 9cac94cd48fde9c9cb1b8f37cd652d974ca8d349 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 25 Jan 2024 10:33:47 +0800
Subject: [PATCH] fix:补充提交

---
 screen-job/src/main/java/com/moral/api/entity/Sensor.java |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/screen-job/src/main/java/com/moral/api/entity/Sensor.java b/screen-job/src/main/java/com/moral/api/entity/Sensor.java
index d53e725..6012513 100644
--- a/screen-job/src/main/java/com/moral/api/entity/Sensor.java
+++ b/screen-job/src/main/java/com/moral/api/entity/Sensor.java
@@ -1,9 +1,9 @@
 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;
 
@@ -38,11 +38,13 @@
     /**
      * ���������������������������
      */
+    @TableField(value = "`desc`")
     private String desc;
 
     /**
      * ������������������
      */
+    @TableField(value = "`code`")
     private String code;
 
     /**
@@ -75,10 +77,22 @@
      */
     private String isDelete;
 
+    @TableField(exist = false)
+    private String unit;
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
+    @TableField(exist = false)
+    private String unitKey;
+
+    @TableField(exist = false)
+    private String showUnit;
+
+    @TableField(exist = false)
+    private String showUnitKey;
+
+    @TableField(exist = false)
+    private String alarmLevel;
+
+    @TableField(exist = false)
+    private String formula;
 
 }

--
Gitblit v1.8.0