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

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2019-01-16 a2cb03002bc7b9ed76e9586947fec73ebc223215

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

@@ -93,7 +93,7 @@
    * 根据电池组id查询电池组的inf表中的放电信息    <!------    跨域访问     --------->

    */

   public String searchBattTestInfDataById_ky(){

      isAllowHeaders();

      //isAllowHeaders();

      Batttestdata_inf bti = ActionUtil.getGson().fromJson(json, Batttestdata_inf.class);

      model=service.serchByCondition_ky(bti);         

      result=ActionUtil.tojson(model);