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

hdw

2018-11-13 4337694caa2cf285e720664df591037cb3d2f809

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

@@ -28,6 +28,13 @@
      result=tojson(model);

      return SUCCESS;

   }

   //批量升级确认

   public String updatePro(){

      List<Fbs9100s_dfu_state>  list=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Fbs9100s_dfu_state>>(){}.getType());

      ServiceModel model=service.updatePro(list);

      result=tojson(model);

      return SUCCESS;

   }

   //升级界面实时刷新

   public String serchByCondition(){

      List<Integer>  list=getGson("yyyy-MM-dd HH:mm:ss").fromJson(json,new TypeToken<List<Integer>>(){}.getType());