From 7d8b9a16166d39e70bf3576bf77a48b7d7c93db1 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.20>
Date: 星期四, 29 十一月 2018 16:57:37 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
index 30619c4..902fcfd 100644
--- a/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battalarm_dataAction.java
@@ -45,8 +45,7 @@
//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