From 7c69a838cf9405289b831423197da83e8fd69ebe Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 二月 2024 11:53:15 +0800
Subject: [PATCH] 开发业务接口

---
 company/src/components/business/OperaApplyChangeUnitDetailWindow.vue |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
index 58d893e..40346f0 100644
--- a/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
+++ b/company/src/components/business/OperaApplyChangeUnitDetailWindow.vue
@@ -12,8 +12,13 @@
                     <div class="desc_item_label_left">
                         <span>鎶曚繚浼佷笟锛歿{ apply.companyName }}</span>
                       <span v-if="model.status === 0">淇濆崟鐘舵�侊細寰呯缃�</span>
+<<<<<<< HEAD
                       <span v-if="model.status === 1">淇濆崟鐘舵�侊細寰呭鏍�</span>
                       <span v-if="model.status === 2">淇濆崟鐘舵�侊細宸蹭笂浼犳壒鍗�</span>
+=======
+                      <span v-if="model.status === 1">淇濆崟鐘舵�侊細宸茬绔�</span>
+                      <span v-if="model.status === 2">淇濆崟鐘舵�侊細宸茬敓鏁�</span>
+>>>>>>> 35bd55ad951fe8c5fb997dfa7bd836ad53db96fe
                       <span v-if="model.status === 3 || model.status === 4">淇濆崟鐘舵�侊細閫�鍥炵敵璇�</span>
                       <span v-if="model.status ===5 || model.status === 8">淇濆崟鐘舵�侊細宸查��鍥�</span>
                       <span v-if="model.status ===7">淇濆崟鐘舵�侊細宸插叧闂�</span>

--
Gitblit v1.9.3