From 8ed64c047f4369fa13e39da4bff4ed201f26f9e1 Mon Sep 17 00:00:00 2001 From: chenjingjing <chenjingjing@LAPTOP-E51P2139> Date: 星期五, 28 十二月 2018 15:30:33 +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 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java index bb15585..ecff064 100644 --- a/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java +++ b/gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java @@ -29,7 +29,7 @@ //璺ㄥ煙璁块棶鏌ヨ鐢垫睜缁勭殑鍗曚綋鏁版嵁 < ! ---- ---- 璺ㄥ煙璁块棶 ------------> 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); model=service.serchByCondition_ky(rtdata); -- Gitblit v1.9.1