From 7d2abb005f5dde19542a2d21c142680098236901 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:56:09 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS-WEB/src/components/Crud/Crud.vue | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Crud/Crud.vue b/Source/UBCS-WEB/src/components/Crud/Crud.vue
index b9cf277..7d7b595 100644
--- a/Source/UBCS-WEB/src/components/Crud/Crud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/Crud.vue
@@ -36,11 +36,7 @@
:props="transferProps" @save="handelTransferSave"></integration-transfer>
</el-button>
<el-button size="small" type="primary" plain @click="findvisible=true">鏌ヨ
-<<<<<<< HEAD
- <advanced-query :visible.sync="findvisible" :options="options"></advanced-query>
-=======
<advanced-query :visible.sync="findvisible" :options="this.options"></advanced-query>
->>>>>>> 859a64b36d107b147f44eccd0c0a76471c5e49ea
</el-button>
<el-button size="small" type="primary" plain>鐩镐技椤规煡璇�</el-button>
<el-button size="small" type="primary" plain style="margin-left: 1px;margin-top:10px">鍒锋柊</el-button>
--
Gitblit v1.9.3