代码合并

2020-06-26 15:07:48 +08:00 · 2020-06-26 15:07:48 +08:00 · 3acc1cd9e4
commit 3acc1cd9e4
parent e50f5ff3a3
1 changed files with 0 additions and 3 deletions
--- a/pages/center/center.js
+++ b/pages/center/center.js
@ -62,8 +62,6 @@ Page({
      },
    })
  },
-<<<<<<< HEAD
-=======
  /**
   * 跳转到我的志愿团队页面
   */
@ -81,7 +79,6 @@ Page({
    })
  },

->>>>>>> 8efd16995df21586c7ff79678f34b0547afeb3e4
  /**
   * 生命周期函数--监听页面加载
   */