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

hdw

2018-10-26 e458320cba7664a484d3a763e288047edb74d55f

 gx_tieta/WebRoot/control.jsp

@@ -823,7 +823,7 @@
            <table>

               <tbody>

                  <tr>

                     <th>机房名称</th>

                     <th>机房名称/机房id</th>

                  </tr>

                  <tr>

                     <td>