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

whyclj

2018-12-29 1e2369de8e321bdf7d9ee692aa55d65d8ac560b8

 gx_tieta/src/com/fgkj/actions/ram/Fbs9100_stateAction.java

@@ -112,7 +112,7 @@
       

   //11.1FBS9100设备通信状态查询             <--     跨域    -->

     public String serchByCondition_ky(){        

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

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

        ServiceModel model = new ServiceModel();

      model = service.serchByCondition_ky();           

        result = tojson(model);