'更新'

2022-03-16 09:43:13 +08:00
parent 79b7fe0eec 2329a20c4f
commit f219b55d0c
19 changed files with 754 additions and 1115 deletions
--- 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-15 18:33:24
 * @Description: file content
+=======
+ * @LastEditors: zwq
+ * @LastEditTime: 2022-03-15 10:16:52
+>>>>>>> develop
 */
 export default {
  visual: {