Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git ...

hdw

2018-12-05 a50eeca38aac03ba7a4fb9f27f73133936b8597a

 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)

   {