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

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2018-12-29 c363f330655a2e7d5dfe54a767e10d8c86ea96a6

 gx_tieta/WebRoot/pages/css/pages/navconfig.css

@@ -31,7 +31,8 @@
   overflow-y: auto;

}

.navSort-content-item {

   width: 350px;

   padding-left: 15px;

   padding-right: 15px;

}

#navSortShadow {

   display: none;