merge

2021-12-08 16:04:59 +08:00
parent d29b807247
commit 9f3c13f893
3 changed files with 3 additions and 31 deletions
--- a/src/mock/index.js
+++ b/src/mock/index.js
@@ -1,13 +1,8 @@
 /*
 * @Author: zwq
 * @Date: 2021-11-15 08:20:28
-<<<<<<< HEAD
 * @LastEditors: gtz
- * @LastEditTime: 2021-12-07 11:07:41
-=======
- * @LastEditors: zwq
- * @LastEditTime: 2021-12-06 15:15:08
->>>>>>> master
+ * @LastEditTime: 2021-12-08 16:04:50
 * @Description:
 */
 import Mock from 'mockjs'