From a0a6f95ec5b92be03385eea83b64bf97fcbfa17e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 02 Nov 2023 17:08:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionInsertForm.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionInsertForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionInsertForm.java
index 93d7f83..2e68be0 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionInsertForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/unitConversion/UnitConversionInsertForm.java
@@ -28,6 +28,11 @@
* */
private String formula;
+ /*
+ * ������������code������������null������������
+ * */
+ private String sensorCode;
+
public boolean valid(){
if(
ObjectUtils.isEmpty(originalUnitKey)||
@@ -43,6 +48,7 @@
unitConversion.setOriginalUnitKey(originalUnitKey);
unitConversion.setTargetUnitKey(targetUnitKey);
unitConversion.setFormula(formula);
+ unitConversion.setSensorCode(sensorCode);
return unitConversion;
}
--
Gitblit v1.8.0