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

hdw

2019-01-11 b66ed691935b9369cb93c5397d562128591b09d7

 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);

            }