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

LiuHao

2023-06-06 06bc04c04c120b2e89a661c36b6316b99c1ad6ea

 src/views/system/dept/index.vue

@@ -232,7 +232,7 @@
            nextTick(() => {
                reset();
                if (row && row.deptId) {
                    form.value.parentId = row?.parentId;
                    form.value.parentId = row?.deptId;
                }
            })
        }