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/mylayui.css

@@ -327,4 +327,11 @@
}

.page-link:active {

   color: #FF0000;

}

/* layui style */

body .layui-tab {

   margin:1px 0;

}

body .layui-tab-content {

   padding: 0;

}