修改bug

2022-03-14 10:59:13 +08:00
parent 3d3c802d01
commit 21d45adf22
8 changed files with 165 additions and 89 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-11 11:13:47
-=======
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-12 14:22:52
->>>>>>> develop
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-14 10:58:20
 * @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-11 11:13:22
- * @Description: file content
-=======
- * @LastEditors: gtz
- * @LastEditTime: 2022-03-12 14:23:06
->>>>>>> develop
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-14 10:58:12
 */
 export default {
  visual: {