From 030de8f10eee755bb99fd4b2de83f09e6be6ae72 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期二, 27 十一月 2018 16:06:12 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://didiyu@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
index 09d13cc..74ee71d 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
@@ -90,7 +90,7 @@
//瀹炴椂鐩戞祴涓殑鏌ヨ瀹炴椂缁勭淇℃伅 <!-- 璺ㄥ煙璁块棶 --->
public String serchByCondition_ky(){
- ActionUtil.isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ //ActionUtil.isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
model = new ServiceModel();
//System.out.println("寮�濮嬫煡璇tstate");
rtstate = ActionUtil.getGson().fromJson(json, Batt_rtstate.class);
--
Gitblit v1.9.1