From a6b4c1e19b3b3fdcf80d7f69f20fe406205fcf8f Mon Sep 17 00:00:00 2001
From: LiJun <LiJun@192.168.10.20>
Date: 星期一, 26 十一月 2018 11:54:39 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
index 7bc9597..bb15585 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java
@@ -27,11 +27,12 @@
 		return SUCCESS;
 	}
 	
-	//璺ㄥ煙璁块棶鏌ヨ鐢垫睜缁勭殑鍗曚綋鏁版嵁
+	//璺ㄥ煙璁块棶鏌ヨ鐢垫睜缁勭殑鍗曚綋鏁版嵁			< ! ---- ----  璺ㄥ煙璁块棶  ------------>
 	public String serchByCondition_ky(){
 		ActionUtil.isAllowHeaders();
+		ServiceModel model = new ServiceModel();		
 		Batt_rtdata rtdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_rtdata.class);
-		ServiceModel model=service.serchByCondition_ky(rtdata);
+		model=service.serchByCondition_ky(rtdata);			
 		result=ActionUtil.tojson(model);
 		return SUCCESS;
 	}

--
Gitblit v1.9.1