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

81041

2018-11-28 a8717f6d4e9f2761d666c430e4546eef6a7f8f12

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

@@ -386,7 +386,7 @@
   

   //跨域访问获取所有电池组的信息<-------跨域----------->

   public String searchInform_ky(){

      isAllowHeaders();                     //允许跨域访问

      //isAllowHeaders();                     //允许跨域访问

      ServiceModel model = new ServiceModel();

      model = service.searchInform_ky();      

      result = ActionUtil.tojson(model);