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

didiyu

2018-12-18 99ed6cd7dc00f90b6161fbc44fc878f18ee248c2

 gx_tieta/WebRoot/css/basic.css

@@ -45,7 +45,7 @@
   background-color:#FFF;

   color:#fff;

   position:relative;

   z-index:99;

   z-index:900;

   }

#nav a.active {

   background-color:#349d36;