'更新'

2022-03-16 09:41:00 +08:00
parent 6ac3fcb572
commit 79b7fe0eec
3 changed files with 16 additions and 18 deletions
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/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: '存储箱名称',