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

@@ -22,7 +22,6 @@
        if (d.containsBounds(c.getBounds())) {

            return

        }

        console.log(c.getBounds());

        var i = c.getBounds(),

            h = i.getSouthWest(),

            g = i.getNorthEast(),