'更新'

2022-03-15 09:55:49 +08:00
parent afde4d5225 8da50584fc
commit 3e6389f0eb
14 changed files with 785 additions and 1034 deletions
--- a/src/lang/i18n/en/module/basicData.js
+++ b/src/lang/i18n/en/module/basicData.js
@@ -1,8 +1,13 @@
 /*
 * @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
 * @Description: file content
 */
 export default {
--- a/src/lang/i18n/zh/module/basicData.js
+++ b/src/lang/i18n/zh/module/basicData.js
@@ -1,9 +1,14 @@
 /*
 * @Author: gtz
 * @Date: 2021-03-04 16:13:51
+<<<<<<< HEAD
 * @LastEditors: fzq
 * @LastEditTime: 2022-03-14 16:22:20
 * @Description: file content
+=======
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-14 10:58:12
+>>>>>>> develop
 */
 export default {
  visual: {