From 1e230c759b103fe6c8768d91aa566408293b93c6 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 31 十月 2018 14:46:59 +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 56ebbc2..f60c0a3 100644
--- a/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
+++ b/gx_tieta/src/com/fgkj/dao/AlarmDaoFactory.java
@@ -61,7 +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=3000;//璇煶鎾姤鐨勬椂闂撮棿闅�
+ public static final int alarm_voice_timelong=30;//璇煶鎾姤鐨勬椂闂撮棿闅�
public static String getAlarmName(int type)
{
--
Gitblit v1.9.1