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

@@ -276,4 +276,7 @@
   margin-left: -250px;

   top: 50%;

   margin-top: -150px;

}

.hdw-dialog-content-container {

   position: relative;

}