From 3eceda186bc2fe136d1402926552eb85a3335b07 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 13 五月 2026 09:46:54 +0800
Subject: [PATCH] 维护

---
 src/views/project/donatebaseinfo/index.vue |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 61efd61..6442bd2 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -21,11 +21,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="5">
-<<<<<<< HEAD
           <el-form-item label="鎶ュ憡鍖婚櫌" prop="treatmenthospitalname">
-=======
-          <el-form-item label="涓婃姤鍖婚櫌" prop="treatmenthospitalname">
->>>>>>> 059398ad3ad81ea49dfb75ac09f268bc0b0f6145
             <org-selecter
               ref="orgSelecter"
               :org-type="'3'"

--
Gitblit v1.9.3