From e4be5ba9eea9fe8408f3a7048a315b3767b33f49 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 23 二月 2024 09:54:38 +0800
Subject: [PATCH] mrshi
---
platform/src/views/business/dispatchUnit.vue | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/platform/src/views/business/dispatchUnit.vue b/platform/src/views/business/dispatchUnit.vue
index c7c2b55..cf32e52 100644
--- a/platform/src/views/business/dispatchUnit.vue
+++ b/platform/src/views/business/dispatchUnit.vue
@@ -2,11 +2,7 @@
<TableLayout :permissions="['business:dispatchunit:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-<<<<<<< HEAD
- <el-form-item label="鎵�灞炰笟" prop="companyId">
-=======
<el-form-item label="鎵�灞炰紒涓�" prop="companyId">
->>>>>>> c421d2deeec5530d8060d8e06b5b86bb02e72dbf
<el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
<el-option
v-for="item in companyList"
--
Gitblit v1.9.3