From c119b9dd98241cc623296840e28487e4c5aa6928 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.16>
Date: 星期二, 11 十二月 2018 17:22:53 +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/Battinf_applyAction.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
index 8a36312..eb9ba94 100644
--- a/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
+++ b/gx_tieta/src/com/fgkj/actions/Battinf_applyAction.java
@@ -4,6 +4,7 @@
import com.fgkj.dto.BattInf;
import com.fgkj.dto.Battinf_apply;
+import com.fgkj.dto.Page;
import com.fgkj.dto.ServiceModel;
import com.fgkj.dto.User_inf;
import com.fgkj.services.Battinf_applyService;
@@ -32,8 +33,8 @@
}
//鏌ヨ鍑烘墍鏈夐渶瑕佺‘璁ょ殑鐢宠
public String serchByCondition(){
- Battinf_apply bapply=ActionUtil.getGson().fromJson(json, Battinf_apply.class);
- ServiceModel model=service.serchByCondition(bapply);
+ Page page=ActionUtil.getGson().fromJson(json, Page.class);
+ ServiceModel model=service.serchByCondition(page);
result=tojson(model);
return SUCCESS;
}
--
Gitblit v1.9.1