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

hdw

2018-12-28 c673a0b9ffe1f1239f596dfd88c0a76c735b3d43

 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;

   }