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

81041

2018-11-14 99285fcc7d30e62f1e84e1c96d29d0ffcd9ccdbc

 gx_tieta/src/com/fgkj/actions/Batt_rtdataAction.java

@@ -26,6 +26,16 @@
      result=tojson(model);   

      return SUCCESS;

   }

	
   //跨域访问查询电池组的单体数据

   public String serchByCondition_ky(){

      ActionUtil.isAllowHeaders();

      Batt_rtdata rtdata=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, Batt_rtdata.class);

      ServiceModel model=service.serchByCondition_ky(rtdata);

      result=ActionUtil.tojson(model);

      return SUCCESS;

   }

	
   public String getResult() {

      return result;

   }