From 35ee81e9225e7babf51e9e46f1dea9942aabc2bf Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 22 十月 2018 11:29:56 +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/BattInfAction.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/BattInfAction.java b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
index 512861a..77b20d0 100644
--- a/gx_tieta/src/com/fgkj/actions/BattInfAction.java
+++ b/gx_tieta/src/com/fgkj/actions/BattInfAction.java
@@ -71,6 +71,13 @@
result = tojson(model);
return SUCCESS;
}
+ //鏍规嵁缁存姢鍖哄拰鏈烘埧鍚嶇О鏌ヨ鐢垫睜缁勪俊鎭�
+ public String searchInform1() {
+ Batt_Maint_Dealarm bmd = getGson().fromJson(json, Batt_Maint_Dealarm.class);
+ ServiceModel model = service.searchInform1(bmd);
+ result = tojson(model);
+ return SUCCESS;
+ }
public String serchByCondition() {
model = service.serchByCondition(bif);
result = ActionUtil.tojson(model);
--
Gitblit v1.9.1