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

hdw

2018-12-28 c673a0b9ffe1f1239f596dfd88c0a76c735b3d43

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

@@ -49,6 +49,14 @@
      result = tojson(model);      

      return SUCCESS;   

   }

   //批量设置放电参数

   public String updatePro() {

      List<Fbs9100_setparam> list=getGson().fromJson(json, new TypeToken<List<Fbs9100_setparam>>(){}.getType());

      Fbs9100_setparam fbs = getGson().fromJson(json, Fbs9100_setparam.class);

      ServiceModel model = service.updatePro(list);

      result = tojson(model);		
      return SUCCESS;	
   }

   //点击弹出框的设定按钮,修改ld6测试参数

   public String updateld6Param(){

      Fbs9100_setparam fbs = getGson().fromJson(json, Fbs9100_setparam.class);