From d05458aa3a9721ebaaff2c380b064f6f8052d5af Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 23 六月 2021 09:38:53 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/main.js | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index 7d0ac8d..d1f8973 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -18,9 +18,11 @@
import { getConfigKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
import Pagination from "@/components/Pagination";
-// 鑷畾涔夎〃鏍煎伐鍏锋墿灞�
+// 鑷畾涔夎〃鏍煎伐鍏风粍浠�
import RightToolbar from "@/components/RightToolbar"
-// 澶撮儴鏍囩鎻掍欢
+// 瀛楀吀鏍囩缁勪欢
+import DictTag from '@/components/DictTag'
+// 澶撮儴鏍囩缁勪欢
import VueMeta from 'vue-meta'
// 鍏ㄥ眬鏂规硶鎸傝浇
@@ -47,6 +49,7 @@
}
// 鍏ㄥ眬缁勪欢鎸傝浇
+Vue.component('DictTag', DictTag)
Vue.component('Pagination', Pagination)
Vue.component('RightToolbar', RightToolbar)
--
Gitblit v1.9.3