Merge remote-tracking branch 'origin/dev' into dev

luliqiang

2021-02-19 1df2ad6224fa4bd1ca38d235d5e4b917262added

 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);
            }