Merge remote-tracking branch 'origin/b_lms' into master_merge

2024-06-27 16:00:57 +08:00
parent cd7c68d61d 1cbbe0a9fd
commit e88415bada
4 changed files with 19 additions and 4 deletions
--- a/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue
@@ -39,7 +39,7 @@
    >
      <el-table-column type="selection" width="55" />
      <el-table-column prop="box_no" label="木箱号" />
-      <el-table-column prop="material_code" label="物料编码" />
+      <el-table-column prop="material_code" label="木箱规格" />
      <el-table-column prop="material_name" label="物料名称" />
      <el-table-column prop="box_length" label="木箱长度" />
      <el-table-column prop="box_width" label="木箱宽度" />