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

81041

2018-12-13 512733908ae4f3a851f40f0551724d2186ce56ec

 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;

   }