Merge remote-tracking branch 'origin/master'

czt

3 天以前 dfd2060bdcc0de929b4770a6a4a580c17bd72104

 fzzy-igdss-web/src/main/resources/templates/system/dept/dept.html

@@ -54,7 +54,7 @@
    var removeFlag = [[${@permission.hasPermi('system:dept:remove')}]];
    var datas = [[${@dict.getType('sys_normal_disable')}]];
    var types = [[${@dict.getType('sys_dept_type')}]];
    var prefix = ctx + "system/dept"
    var prefix = ctx + "system/dept-new"

    $(function () {
        var options = {