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

didiyu

2018-09-28 97db75238a96a75f41bafd469548c2a84ba37080

 gx_tieta/WebRoot/equip-charge-param.jsp

@@ -444,7 +444,7 @@
                  var __data = _data[i];

                  var _attr = {

                     'stataion_name1': __data.StationName1,

                     'stataion_name': __data.StationName3,

                     'stataion_name': __data.StationName,

                     'dev_name': __data.FBSDeviceName

                  };

                  var tmp = getOptionsData(__data.StationName3, __data.FBSDeviceId, __data, _attr);