Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev...

81041

2019-01-02 b2f21d080425b0ab6e5e6170914ca2c615e5d185

 gx_tieta/src/com/fgkj/dao/impl/Battalarm_dataDAOImpl.java

@@ -577,7 +577,6 @@
                        while (rs.next()) {

                           String name="未知";         //存放告警名称

                           String type="未知";         //存放告警等级

                           Batt_Maint_Dealarm bmd = new Batt_Maint_Dealarm();

                           

                           Battalarm_data adata = new Battalarm_data();

                           adata.setNum(rs.getInt("num"));