conflict resolve

src/views/ecw/currency/index.vue

@@ -103,10 +103,6 @@
         <el-form-item label="100外币兑人民币汇率" prop="huilv">
           <el-input v-model="form.huilv" placeholder="请输入100外币兑人民币汇率" />
         </el-form-item>
-<<<<<<< HEAD
-=======
-
->>>>>>> e36634b0d3c2c78846c9f2f5246e095085338492
         <el-form-item label="100人民币兑外币汇率" prop="exchangeToFc">
           <el-input v-model="form.exchangeToFc" placeholder="请输入100人民币兑外币汇率" />
         </el-form-item>