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

81041

2018-11-27 85f41f2a3ab8013b68ed0f2e91ab324205a9076e

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

@@ -90,7 +90,7 @@
   

   //实时监测中的查询实时组端信息      <!--   跨域访问 --->

   public String serchByCondition_ky(){   

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

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

      model = new ServiceModel();

      //System.out.println("开始查询rtstate");

      rtstate = ActionUtil.getGson().fromJson(json, Batt_rtstate.class);