From d7049dae792f0a6d2ee4246acf4b42bf0b36635c Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@USER-20180117QL>
Date: 星期二, 25 十二月 2018 11:11:02 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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..ecff064 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();
+		//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