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

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

2018-12-28 b3f62ab5fb6adf03a92f62b42e69ad849f903b45

 gx_tieta/WebRoot/css/popup-tbl.css

@@ -60,6 +60,9 @@
}



.popup .popup-content {

   max-height: 380px;

   overflow:hidden;

   overflow-y: auto;

   padding: 10px 8px;

   background-color: #eee;

}