From c673a0b9ffe1f1239f596dfd88c0a76c735b3d43 Mon Sep 17 00:00:00 2001
From: hdw <hdw@192.168.7.106>
Date: 星期五, 28 十二月 2018 09:24:42 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@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