更新 'src/lang/i18n/zh/module/basicData.js'

src/lang/i18n/zh/module/basicData.js

@@ -1,15 +1,9 @@
 /*
  * @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: {
     addNow: '请先完成当前点位添加！',