From 9bacdad594a2c1fd3af53f44061682dfb77ee8d1 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 8 Sep 2021 14:13:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=87=E4=BB=B6=20step.vue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_client/src/views/mtm/step.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index ac0fdd3..ff42826 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -79,7 +79,6 @@
                 :label="item.label"
                 :value="item.value">
               </el-option>
-<<<<<<< HEAD
             </el-select>
           </el-form-item>
           <el-form-item label="指导书内容" prop="instruction_content">