From 690b6ec75d6f9198d1ca292e107109b80646faf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 08 十月 2021 11:08:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java
index c402b27..8af1911 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java
@@ -32,7 +32,7 @@
             comPropertyAlarm.setCreateTime(DateUtil.date());
             comPropertyAlarm.setPhone(comPropertyEquipment.getPhone());
             comPropertyAlarm.setSerialNo(comPropertyEquipment.getSerialNo());
-            comPropertyAlarm.setType(ComPropertyAlarm.type.one);
+            comPropertyAlarm.setType(ComPropertyAlarm.type.time);
             comPropertyAlarm.setCommunityId(comPropertyEquipment.getCommunityId());
             comPropertyAlarm.setName(comPropertyEquipment.getUsername());
             comPropertyAlarm.setStatus(ComPropertyAlarm.status.dcl);

--
Gitblit v1.7.1