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

chenjingjing

2018-12-27 d6f196106c6ebc45c4a03264b56904549695eec5

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

@@ -29,7 +29,7 @@
   

   //跨域访问查询电池组的单体数据         < ! ---- ----  跨域访问  ------------>

   public String serchByCondition_ky(){

      ActionUtil.isAllowHeaders();

      //ActionUtil.isAllowHeaders();

      ServiceModel model = new ServiceModel();      

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

      model=service.serchByCondition_ky(rtdata);