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/alifont/demo_unicode.html

@@ -33,6 +33,12 @@
        <ul class="icon_lists clear">
            
                <li>
                <i class="icon iconfont">&#xe618;</i>
                    <div class="name">电池4</div>
                    <div class="code">&amp;#xe618;</div>
                </li>
            
                <li>
                <i class="icon iconfont">&#xe619;</i>
                    <div class="name">wxb标王</div>
                    <div class="code">&amp;#xe619;</div>
@@ -81,6 +87,12 @@
                </li>
            
                <li>
                <i class="icon iconfont">&#xe71e;</i>
                    <div class="name">电池1</div>
                    <div class="code">&amp;#xe71e;</div>
                </li>
            
                <li>
                <i class="icon iconfont">&#xe600;</i>
                    <div class="name">断开</div>
                    <div class="code">&amp;#xe600;</div>