Merge branch 'dev1.1' into dev

zhaoxiaohao

2021-03-01 7ea2a2cfe922c9b2d5c09c737d10a7f1ab5b50d1

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

@@ -139,9 +139,9 @@
            if (!strUtil.isEmpty($("#orgId").val())) {
                if (data.field != null) {
                    data.field.enabled = (data.field.enabled == 0) ? false : true;
                    data.field.fromId=0;
                    admin.req('api-user/sysuserorg', JSON.stringify(data.field), function (data) {
                        layer.closeAll('loading');
                        debugger
                        if (data.code == 0) {
                            layer.msg(data.msg, { icon: 1, time: 1000 });
                            admin.finishPopupCenter();