''

2022-03-04 10:48:30 +08:00
parent cb7718c340 7501849be6
commit 581ca3d60b
16 changed files with 284 additions and 161 deletions
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -1,8 +1,13 @@
 /*
 * @Author: gtz
 * @Date: 2021-03-04 16:13:51
+<<<<<<< HEAD
 * @LastEditors: fzq
 * @LastEditTime: 2022-03-03 19:52:51
+=======
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-04 10:13:41
+>>>>>>> develop
 * @Description: file content
 */
 export default {
@@ -232,6 +237,7 @@ export default {
    wasteGrade: '废品等级',
    RegisterPerson: '登记人',
    updateTime: '登记时间',
+    registrationPlace: '登记地点',
    cause: '报废原因',
    causeCode: '报废原因编码',
    WasteName: '废品报废名称',