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

luliqiang

2020-08-27 c49b95fc3576f9a5dad5bcaa6874157d5091f6e0

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/tpl/password.html

@@ -29,7 +29,6 @@
        var config = layui.config;
        var layer = layui.layer;
        var user = config.getUser();
        console.log(user.id);
        $("#id").val(user.id);
        //监听提交
        form.on('submit(submit-psw)', function (data) {