From e622bd5e3b2638b9ab9a712ed1160a66018d6fd7 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 22 二月 2024 09:21:15 +0800
Subject: [PATCH] mrshi

---
 platform/src/views/business/dispatchUnit.vue |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/platform/src/views/business/dispatchUnit.vue b/platform/src/views/business/dispatchUnit.vue
index 39b3bad..c7c2b55 100644
--- a/platform/src/views/business/dispatchUnit.vue
+++ b/platform/src/views/business/dispatchUnit.vue
@@ -2,7 +2,11 @@
   <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