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

81041

2018-11-29 175cc78c4190b874a6abe2c6a208aaecb432f63c

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

            }