From 4a64c0801f147536ed0a9d09977941f313a286ae Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Fri, 18 Aug 2023 16:19:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into wb --- 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