From 2ab4d484c09bf29d5f63dafb0fec3eda23bc4b4e Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Mon, 25 Dec 2023 14:17:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
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