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

81041

2019-01-11 97f57b2ba6ffc490ccd9552dbfbdbc245973764d

 gx_tieta/WebRoot/sys-set-test.jsp

@@ -880,7 +880,7 @@
                       if(rs.code == 1) {

                          data = rs.data;

                       }else {

                          layer.msg('没有可设置的电池组!');

                          layer.msg('没有可设置的机房!');

                       }

                       

                       // 如果有添加的数据