From d9e0aac65db2524fdabaa9b6e5d688c8b8195d7e Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.10>
Date: 星期四, 22 十一月 2018 11:50:13 +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/Battalarm_dataService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
index fdf7cda..517783f 100644
--- a/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
+++ b/gx_tieta/src/com/fgkj/services/Battalarm_dataService.java
@@ -291,7 +291,7 @@
 		adata.setNum(numZ);//瀹炴椂鍛婅鎬绘暟
 		model.setCode(1);
 		model.setData(adata);
-		System.out.println(model.getData());
+		//System.out.println(model.getData());
 		return model;	
 	}
 

--
Gitblit v1.9.1