修改bug

2022-03-11 09:20:02 +08:00
parent cf1e32049c
commit ddcae6d119
4 changed files with 24 additions and 23 deletions
--- a/src/lang/i18n/en/module/basicData.js
+++ b/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-10 14:05:21
-=======
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 16:34:56
->>>>>>> develop
+ * @LastEditTime: 2022-03-11 08:28:27
 * @Description: file content
 */
 export default {
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -1,14 +1,8 @@
 /*
 * @Author: gtz
 * @Date: 2021-03-04 16:13:51
-<<<<<<< HEAD
- * @LastEditors: fzq
- * @LastEditTime: 2022-03-10 14:05:01
- * @Description: file content
-=======
 * @LastEditors: zwq
- * @LastEditTime: 2022-03-09 16:34:50
->>>>>>> develop
+ * @LastEditTime: 2022-03-11 08:28:40
 */
 export default {
  visual: {