From c02e430f16cb51cabb6f4b24f99ec48efc7b0596 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@192.168.10.26>
Date: 星期三, 21 十一月 2018 11:59:20 +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_rtstateAction.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
index 23bb17f..09d13cc 100644
--- a/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Batt_rtstateAction.java
@@ -14,7 +14,7 @@
import com.fgkj.services.Batt_rtstateService;
import com.opensymphony.xwork2.ActionSupport;
-public class Batt_rtstateAction extends ActionSupport{
+public class Batt_rtstateAction extends ActionUtil{
private Batt_rtstateService service=new Batt_rtstateService();
private ServiceModel model;
private Batt_rtstate rtstate;
@@ -91,9 +91,10 @@
//瀹炴椂鐩戞祴涓殑鏌ヨ瀹炴椂缁勭淇℃伅 <!-- 璺ㄥ煙璁块棶 --->
public String serchByCondition_ky(){
ActionUtil.isAllowHeaders(); //鍏佽璺ㄥ煙璁块棶
+ model = new ServiceModel();
//System.out.println("寮�濮嬫煡璇tstate");
rtstate = ActionUtil.getGson().fromJson(json, Batt_rtstate.class);
- model=service.serchByCondition_ky(rtstate);
+ model=service.serchByCondition_ky(rtstate);
//System.out.println(model);
result = ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").toJson(model);
return SUCCESS;
--
Gitblit v1.9.1