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

hdw

2018-11-03 4fa214f38cb5a19599655636a8ea4e25eaf496a3

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

@@ -33,7 +33,7 @@
   }

   //统计机房状态历史(机房状态)

   public String serchStateBydev_id(){

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

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

      ServiceModel model=service.serchStateBydev_id(binf);

      result=tojson(model);

      return SUCCESS;