From 43e5052b91f0568ccbcf3fd6df70cf8209db184a Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 28 May 2021 17:36:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/entity/VersionSensorUnit.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 a4432ec..0802b5c 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
@@ -36,9 +36,9 @@
private Integer versionId;
/**
- * ������code
+ * ������Id
*/
- private String sensorCode;
+ private Integer sensorId;
/**
* ������������key
@@ -48,12 +48,12 @@
/*
* ���������
* */
- private Integer maxValue;
+ private Double upper;
/*
* ���������
* */
- private Integer minValue;
+ private Double lower;
/**
* ������������
--
Gitblit v1.8.0