From 4ad67c20b9c5e6625babefeee59ccee155cfc3aa Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 18 Jun 2021 16:54:10 +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/VersionSensorUnit.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java b/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java
index 52e0374..33c428e 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.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.time.LocalDateTime;
@@ -38,7 +39,13 @@
/**
* ������Id
*/
+ @TableField(exist = false)
private Integer sensorId;
+
+ /*
+ * ������code
+ * */
+ private String sensorCode;
/**
* ������������key
@@ -48,12 +55,12 @@
/*
* ���������
* */
- private Integer maxValue;
+ private Double upper;
/*
* ���������
* */
- private Integer minValue;
+ private Double lower;
/**
* ������������
--
Gitblit v1.8.0