From b3460365bca5a645e3e37d69dd606ae8bea8cbb0 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 07 一月 2019 16:11:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/src/com/fgkj/actions/App_bts_comm_taskAction.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/App_bts_comm_taskAction.java b/gx_tieta/src/com/fgkj/actions/App_bts_comm_taskAction.java
index ea3e9d9..19c5fc4 100644
--- a/gx_tieta/src/com/fgkj/actions/App_bts_comm_taskAction.java
+++ b/gx_tieta/src/com/fgkj/actions/App_bts_comm_taskAction.java
@@ -17,10 +17,10 @@
//鏍规嵁鐪佸競鍖烘満鎴垮悕绉版煡璇�
public String serchByCondition(){
- Page page=getGson("").fromJson(json, Page.class);
+ BattInf binf=getGson("").fromJson(json, BattInf.class);
/*User_inf uinf=(User_inf) getUser();
binf.setNum(uinf.getUId());*/
- ServiceModel model=service.serchByCondition(page);
+ ServiceModel model=service.serchByCondition(binf);
result=tojson(model);
return SUCCESS;
}
--
Gitblit v1.9.1