From 06b00a178d194d33370e44410c4f04a4164f86c7 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 24 Jun 2021 14:07:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-manage/src/main/java/com/moral/api/pojo/form/organizationUnitAlarm/OrganizationUnitAlarmUpdateForm.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/organizationUnitAlarm/OrganizationUnitAlarmUpdateForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/organizationUnitAlarm/OrganizationUnitAlarmUpdateForm.java
index cf168a9..b2efc97 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/organizationUnitAlarm/OrganizationUnitAlarmUpdateForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/organizationUnitAlarm/OrganizationUnitAlarmUpdateForm.java
@@ -39,3 +39,4 @@
         return organizationUnitAlarm;
     }
 }
+

--
Gitblit v1.8.0