From 2d05296d36e200eb66711057f4997872efab46d1 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.1.4>
Date: 星期一, 24 十二月 2018 10:14:18 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java b/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
index f60c0a3..343dbcf 100644
--- a/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
@@ -123,7 +123,7 @@
case 618502 : dev_name = "閫氳鍛婅";break;
case 618503 : dev_name = "璁惧杩囨俯鍛婅";break;
case 618504 : dev_name = "浜屾瀬绠1鍛婅";break;
-
+ case 119028 : dev_name = "璁惧楂樻俯鍛婅";break;
}
return dev_name;
--
Gitblit v1.9.1