From cd98c69ff835643f518337ee9ab532885c647efb Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 15 三月 2024 18:48:39 +0800
Subject: [PATCH] 合并代码
---
pages/teacherCertification/index.js | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/pages/teacherCertification/index.js b/pages/teacherCertification/index.js
index 71dd20a..358d636 100644
--- a/pages/teacherCertification/index.js
+++ b/pages/teacherCertification/index.js
@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-// pages/bookServices/index.js
-=======
-// pages/teacherCertification/index.js
->>>>>>> master
Page({
/**
@@ -16,7 +11,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad(options) {
-
+ console.log(options);
},
/**
--
Gitblit v1.9.1