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

Administrator

2018-12-12 35fd1cfc84fd97990ba86d4cbb0a6ff0c45c2d78

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

            }