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

克 刘

2020-08-20 3d67c92b08cd86ec3ee9ad4044fb26144dc91fac

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/org_form.html

@@ -65,7 +65,7 @@
        var tree = parent.layui.tree;
        var $ = parent.layui.jquery;

        permissionsInput();
        permissionsInput(res,config);
        //组织结构树
        var getData = function () {
            admin.req('api-user/sysorganization/getTree', { is_del: 0, enabled: 1 }, function (data) {