From 6f12948893fcc846dfb32aa861c473a842edcd56 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 14:46:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_
---
screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java b/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java
index f6a2994..348cd15 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/UnitConversion.java
@@ -45,6 +45,11 @@
*/
private String formula;
+ /*
+ * ������code
+ * */
+ private String sensorCode;
+
/**
* ������������
*/
@@ -61,6 +66,7 @@
private String isDelete;
+
@Override
protected Serializable pkVal() {
return this.id;
--
Gitblit v1.8.0