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

hdw

2018-11-01 43d0c4cc8eb7364415ce4b7e358a10747c6cfe1d

 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;