From 43fe18b40a84b82ca5c5f1a88abb89ea168f95f5 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.23>
Date: 星期一, 12 十一月 2018 10:12:26 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java b/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
index d3c744d..f60c0a3 100644
--- a/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
@@ -61,6 +61,7 @@
public static final int Alarm_IGNAL_ID_CapChangeLow =21;
public static final int Alarm_IGNAL_ID_CapChangeHigh =22;
+ public static final int alarm_voice_timelong=30;//璇煶鎾姤鐨勬椂闂撮棿闅�
public static String getAlarmName(int type)
{
--
Gitblit v1.9.1