From 992a9184ef1085649688da4a95c0e16789c12be6 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 26 五月 2023 09:57:30 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS-WEB/src/main.js | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/main.js b/Source/UBCS-WEB/src/main.js
index a59e801..1eec9df 100644
--- a/Source/UBCS-WEB/src/main.js
+++ b/Source/UBCS-WEB/src/main.js
@@ -20,7 +20,7 @@
import basicContainer from './components/basic-container/main';
import thirdRegister from './components/third-register/main';
import flowDesign from './components/flow-design/main';
-import avueUeditor from 'avue-plugin-uavueeditor';
+import avueUeditor from 'avue-plugin-ueditor';
import website from '@/config/website';
import crudCommon from '@/mixins/crud';
// 涓氬姟缁勪欢
@@ -40,6 +40,7 @@
import referConfigCrudDialog from "@/components/code-dialog-page/referConfigCrudDialog"
import referConfigFormDialog from "@/components/code-dialog-page/referConfigFormDialog"
import businessAdd from "@/views/modeling/BusinessAdd"
+import TableCrud from "@/components/Crud/Crud"
// 灏嗗伐鍏峰嚱鏁版坊鍔犲埌鍏ㄥ眬
import utilFunc from './util/func'
@@ -81,7 +82,7 @@
Vue.component('referConfigFormDialog',referConfigFormDialog)
Vue.component('businessAdd',businessAdd)
Vue.component('attrCrud',attrCrud)
-
+Vue.component('TableCrud',TableCrud)
// 鍔犺浇鐩稿叧url鍦板潃
--
Gitblit v1.9.3