From df67fe187fae9ce9f486ea2f14c95a14d843e4a1 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 15 Nov 2023 14:23:56 +0800
Subject: [PATCH] fix：增加导出功能
---
screen-job/src/main/java/com/moral/api/entity/Sensor.java | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 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 aa2e3ec..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,6 +1,7 @@
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.io.Serializable;
@@ -37,11 +38,13 @@
/**
* ���������������������������
*/
+ @TableField(value = "`desc`")
private String desc;
/**
* ������������������
*/
+ @TableField(value = "`code`")
private String code;
/**
@@ -74,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