Merge branch 'pay_master' into dev

bingbing

2020-10-26 34589cd092e0de8cfd704cd59608ed0f36f6093a

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/config.js

@@ -48,7 +48,6 @@
        // 当前登录的用户
        getUser: function () {
            var u = layui.data(config.tableName).login_user;
            // debugger;
            if (u) {
                return JSON.parse(u);
            }