From df2f2b669f4196f599ca4db91917314ddc4ed94f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 23 Jun 2021 14:47:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-manage/src/main/java/com/moral/api/entity/OrganizationUnitAlarm.java |    2 +-
 1 files changed, 1 insertions(+), 1 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..6ac8cc3 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;
 
     /**
      * ���������������������

--
Gitblit v1.8.0