From 4555d41a66b83c8eb61bd99faf473985aeffda1f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 01 二月 2024 09:11:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
company/src/views/enterprise/add_subtract.vue | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/company/src/views/enterprise/add_subtract.vue b/company/src/views/enterprise/add_subtract.vue
index 43dcd66..9f45503 100644
--- a/company/src/views/enterprise/add_subtract.vue
+++ b/company/src/views/enterprise/add_subtract.vue
@@ -42,9 +42,12 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
+<<<<<<< HEAD
+=======
<ul class="toolbar" v-permissions="['business:applychange:create']">
<li><el-button type="primary" @click="$refs.operaApplyChangeWindow.open('鏂板缓')" v-permissions="['business:applychange:create']">鏂板缓</el-button></li>
</ul>
+>>>>>>> 48eb5dc61ac07d232632b13d040006128ed5cceb
<el-table
v-loading="isWorking.search"
:data="tableData.list"
--
Gitblit v1.9.3