From 4450dd41e8d5828e5da4d277c86e54551a6b6c15 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 16 Dec 2021 09:06:28 +0800
Subject: [PATCH] 设备新增,修改是工艺字段可以为多个,修改mapper,sql

---
 screen-manage/src/main/java/com/moral/api/entity/Sensor.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 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 9a16d4d..d83752e 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
@@ -61,7 +61,7 @@
     /**
      * ������������
      */
-    private String defaultUtil;
+    private String defaultUnitKey;
 
     /**
      * ������������
@@ -84,4 +84,16 @@
     @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