From cb81eef3d9aabe280e506fc7971c539542cf13f7 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 19 Aug 2021 15:12:01 +0800
Subject: [PATCH] 冲突

---
 src/views/securityGuard/data.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index d50ba09..cff9cc9 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -529,7 +529,7 @@
         // prop: "deptName",
         prop: "deptId",
         type: "tree",
-        dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+        // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
         props: {
             label: "title",
             value: "id",

--
Gitblit v1.9.3