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

hdw

2019-01-04 2f967bc373b23a48ff986a965155361a70bd2eb0

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

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

      return SUCCESS;   

   }

   //批量设置系统参数

   public String updatePro() {

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

      ServiceModel model = service.updatePro(list);

      result = tojson(model);		
      return SUCCESS;	
   }

	
   //根据设备id查询系统参数(一定是被管理的)

   public String serchByCondition(){

      Fbs9100_sysparam sys= getGson().fromJson(json, Fbs9100_sysparam.class);