'更新'

src/lang/i18n/en/module/basicData.js

@@ -1,13 +1,8 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-14 16:22:38
-=======
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:58:20
->>>>>>> develop
+ * @LastEditTime: 2022-03-15 18:33:48
  * @Description: file content
  */
 export default {
@@ -174,7 +169,13 @@ export default {
     processEquipment: 'Process Equipment',
     sheCode: 'Shelf Code',
     sheName: 'Shelf Name',
-    locaNum: 'Location Number'
+    locaNum: 'Location Number',
+    addLocation: 'Add Location',
+    columnMark: 'Column Mark',
+    rowMark: 'Row Mark',
+    status: 'Status',
+    man: 'Man',
+    woman: 'Woman'
   },
   storageBox: {
     name: 'Name',

src/lang/i18n/zh/module/basicData.js

@@ -1,14 +1,9 @@
 /*
  * @Author: gtz
  * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
  * @LastEditors: fzq
- * @LastEditTime: 2022-03-14 16:22:20
+ * @LastEditTime: 2022-03-15 18:33:24
  * @Description: file content
-=======
- * @LastEditors: zwq
- * @LastEditTime: 2022-03-14 10:58:12
->>>>>>> develop
  */
 export default {
   visual: {
@@ -165,7 +160,9 @@ export default {
     processEquipment: '工艺设备',
     sheCode: '货架编码',
     sheName: '货架名',
-    locaNum: '库存数量'
+    locaNum: '库存数量',
+    man: '男',
+    woman: '女'
   },
   storageBox: {
     name: '存储箱名称',