From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionVO.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionVO.java
index 3aa65f2..0093163 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/unitConversion/UnitConversionVO.java
@@ -43,6 +43,11 @@
*/
private String formula;
+ /*
+ * ������code
+ * */
+ private String sensorCode;
+
/**
* ������������
*/
@@ -52,4 +57,6 @@
* ������������
*/
private String updateTime;
+
+
}
--
Gitblit v1.8.0