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

luliqiang

2020-07-12 9140edf9b115a6b38c599878093d595ef84228f1

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

@@ -199,6 +199,7 @@
                    // debugger;
                    config.putUser(user);
                    admin.putTempData("permissions", user.permissions);
                    admin.putTempData("organization",user.organizations[user.organizations.length-1]);
                    success(user);
                } else {
                    if (data.code === 1000) {