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

hdw

2018-11-06 d713b84e6285cde8db1d17c0138b46ec7ae7a599

 gx_tieta/WebRoot/equipment.jsp

@@ -930,7 +930,7 @@
               var _attr = {

                  StationId: __data.StationId

               };

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

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

               optsList.push(tmp);

            }