Merge branch 'dev' into songshankun/adjust-style

songshankun

2023-10-20 2ab9e3e914b6c29a3ab34d7b73113e751e113f0f

 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>