From cdd399de614778acee8880ec133242c5500c3e03 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期三, 12 八月 2026 09:56:22 +0800
Subject: [PATCH] 合并冲突
---
src/views/project/travelexpenseapply/index.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/project/travelexpenseapply/index.vue b/src/views/project/travelexpenseapply/index.vue
index 2e01206..89d2c2f 100644
--- a/src/views/project/travelexpenseapply/index.vue
+++ b/src/views/project/travelexpenseapply/index.vue
@@ -158,7 +158,7 @@
</template>
</el-table-column>
<el-table-column
- label="鐢宠鏉愭枡鐘舵��"
+ label="鏉愭枡棰勫鐘舵��"
width="140"
align="center"
prop="checkstatus"
--
Gitblit v1.9.3