From 9ba77f85d56a4a52d5a7b57c9747dd96ee6f1ba6 Mon Sep 17 00:00:00 2001
From: 军 <军@hp-pc>
Date: 星期六, 29 九月 2018 19:01:14 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/services/BattMap_informationService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
index db0b9b4..69680d3 100644
--- a/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
+++ b/gx_tieta/src/com/fgkj/services/BattMap_informationService.java
@@ -100,7 +100,7 @@
 				state="item-normal";
 				ServiceModel model=new ServiceModel();
 				BattMap_information binformation = list.get(i);
-				if(binformation.getFBSDeviceId()/100000==6185){
+				/*if(binformation.getFBSDeviceId()/100000==6185){
 					BattInf binf=new BattInf();
 					binf.setFBSDeviceId(binformation.getFBSDeviceId());
 					state=(new Fbs9100_stateImpl().seachDevNow(binf));
@@ -119,7 +119,7 @@
 							}
 						}
 					}
-				}
+				}*/
 				model.setData(list.get(i));
 				model.setCode(numAlarm);		//鍛婅鎬绘暟
 				model.setSum(numBadBatt);		//钀藉悗鎬绘暟

--
Gitblit v1.9.1