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

didiyu

2019-01-05 4f39b4da8aae5c905cb35f32a2112db2c488e07f

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

@@ -41,8 +41,13 @@
      result = tojson(model);             

      return SUCCESS;

    }

    
    
  //查询设备SD卡的实时状态

    public String serchSDCard(){

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

       ServiceModel model = service.serchSDCard(binf);

       result=tojson(model);

       return SUCCESS;

    }