From cf6a4b874aed82592eea78294715c7c688f9b248 Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期五, 03 十一月 2023 14:50:31 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/add-token

---
 src/views/warehouseManage/position/AddDialog.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/warehouseManage/position/AddDialog.vue b/src/views/warehouseManage/position/AddDialog.vue
index cc28fb6..dba6cb2 100644
--- a/src/views/warehouseManage/position/AddDialog.vue
+++ b/src/views/warehouseManage/position/AddDialog.vue
@@ -56,7 +56,7 @@
                     :disabled="editCommonConfig.title!='鏂板缓'"
                     style="width: 90%"
                   >
-                    <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
+                    <el-option v-for="item in positionList" :key="item.id" :label="item.jointName" :value="item.id">
                     </el-option>
                   </el-select>
                 </el-form-item>

--
Gitblit v1.8.0