From 12c384847af42270e2ba167467173a928a59ded2 Mon Sep 17 00:00:00 2001
From: didiyu <1293722656@qq.com>
Date: 星期四, 29 十一月 2018 10:05:03 +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/Battalarm_dataAction.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
index 3f974c1..902fcfd 100644
--- a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
@@ -42,11 +42,10 @@
return SUCCESS;
}
- //0.5鏌ヨ瀹炴椂鍛婅鏁�
+ //0.5鏌ヨ瀹炴椂鍛婅鏁�(鐢垫睜鍛婅鐜�)
public String serchAlm(){
User_inf uinf=(User_inf) ActionUtil.getUser();
- bmd.setUinf(uinf);
- ServiceModel model=service.serchAlm(bmd);
+ ServiceModel model=service.serchAlm(uinf);
result=ActionUtil.tojson(model);
return SUCCESS;
}
--
Gitblit v1.9.1