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/js/rightmenu.js

@@ -47,6 +47,7 @@
        'display':'block',

        'padding':'6px 14px',

        'text-decoration':'none',

        'white-space': 'nowrap',

        'text-align':'center',

        'color':'#000000',

        'border-bottom':'1px solid #349d36'