Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_form.html

@@ -70,10 +70,10 @@
                if (user) {
                    form.val('user-form', user);
                    $('#user-form').attr('method', 'POST');
                    if(!(user.mobile==null || user.mobile.trim()=="")){
                        $("#mobile").prop("disabled",true)
                    }
                    $("#username").prop("disabled",true)
                    // if(!(user.mobile==null || user.mobile.trim()=="")){
                    //     $("#mobile").prop("disabled",true)
                    // }
                    // $("#username").prop("disabled",true)
                    var rds = new Array();
                    for (var i = 0; i < user.roles.length; i++) {
                        rds.push(user.roles[i].id);