From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Thu, 14 Dec 2023 15:38:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa --- 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