Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui into master

src/views/kaihe/shipDynamics/vesselDetail/index.vue

@@ -436,7 +436,7 @@
                 <el-option
                   v-for="item in this.vesselOptions"
                   :key="item.fId"
-                  :label="item.fImo"
+                  :label="item.fName"
                   :value="item.fId"
                 />
               </el-select>