From 36a11d78a2517b523fcf6b6ec622f3f0767f553f Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 11:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into wb

---
 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