From e6f974ca6eab798c2df5c09cdb8320ecf4ff4185 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 16:52:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb_21
---
screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java b/screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java
index 0993446..a3cc4d2 100644
--- a/screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java
+++ b/screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java
@@ -43,7 +43,7 @@
/**
* ������code
*/
- private Integer sensorCode;
+ private String sensorCode;
/**
* ���������������������
@@ -75,10 +75,5 @@
*/
private String isDelete;
-
- @Override
- protected Serializable pkVal() {
- return this.id;
- }
}
--
Gitblit v1.8.0