Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git...

81041

2018-12-11 c119b9dd98241cc623296840e28487e4c5aa6928

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

@@ -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;

    }