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

侯瑞军

2020-05-14 293d5042a773595ded45bdc9c69c4555ab9c5dd5

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

@@ -141,7 +141,6 @@
                    data.field.enabled = (data.field.enabled == 0) ? false : true;
                    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();