modify

@@ -33,12 +33,9 @@
                             <el-input type="text" v-model="newDictionary.route" placeholder="请输入航线" maxlength="40">
                             </el-input>
                         </el-form-item>
-<<<<<<< HEAD
                         <!-- <el-form-item label="是否为ET86航线">
                           <el-checkbox v-model="newDictionary.isEtesRoute"></el-checkbox>
                         </el-form-item> -->
-=======
->>>>>>> fix-issues
                         <el-form-item>
                             <div style="color:#ff4949;line-height: 30px;">注意：此处不能添加虚拟航班！</div>
                         </el-form-item>