From 70fb56a9fb61f70ccc55fcbc085b470e9423858a Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期一, 05 六月 2023 16:16:35 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS-WEB/src/main.js | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/Source/UBCS-WEB/src/main.js b/Source/UBCS-WEB/src/main.js
index 0ea5d3e..5ceed92 100644
--- a/Source/UBCS-WEB/src/main.js
+++ b/Source/UBCS-WEB/src/main.js
@@ -39,6 +39,9 @@
import formulaEditor from "@/components/code-dialog-page/formulaEditor"
import referConfigCrudDialog from "@/components/code-dialog-page/referConfigCrudDialog"
import referConfigFormDialog from "@/components/code-dialog-page/referConfigFormDialog"
+import referBtmTypeCrudDialog from "@/components/code-dialog-page/referBtmTypeCrudDialog"
+import referSelectBtmAttrDialog from "@/components/code-dialog-page/referSelectBtmAttrDialog"
+import advancedQuery from "@/components/advanced-query/advancedQuery"
import businessAdd from "@/views/modeling/BusinessAdd"
import TableCrud from "@/components/Crud/Crud"
import originalAdd from "@/views/modeling/originalAdd"
@@ -82,10 +85,13 @@
Vue.component('formulaEditor',formulaEditor)
Vue.component('referConfigCrudDialog',referConfigCrudDialog)
Vue.component('referConfigFormDialog',referConfigFormDialog)
+Vue.component('advancedQuery',advancedQuery)
Vue.component('businessAdd',businessAdd)
Vue.component('attrCrud',attrCrud)
Vue.component('TableCrud',TableCrud)
Vue.component('originalAdd',originalAdd)
+Vue.component('referBtmTypeCrudDialog',referBtmTypeCrudDialog)
+Vue.component('referSelectBtmAttrDialog',referSelectBtmAttrDialog)
Vue.component('FormTemplateDialog',FormTemplateDialog)
// 鍔犺浇鐩稿叧url鍦板潃
--
Gitblit v1.9.3