From d5a26ba2eab0a966c1754ef1d9918bfcb6e1e289 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 26 二月 2025 15:07:23 +0800
Subject: [PATCH] 合并冲突
---
src/components/view/b1-expenses.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/view/b1-expenses.vue b/src/components/view/b1-expenses.vue
index 62fd65a..d444071 100644
--- a/src/components/view/b1-expenses.vue
+++ b/src/components/view/b1-expenses.vue
@@ -50,9 +50,9 @@
<div>
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;text-align: left;">璐圭敤缁熻</el-col>
- <el-col :span="12" style="text-align: right;">
+ <!-- <el-col :span="12" style="text-align: right;">
<el-button size="small" type="primary">OA鎺ㄩ��</el-button>
- </el-col>
+ </el-col> -->
</el-row>
</div>
<div class="search">
--
Gitblit v1.9.3