diff --git a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
index d1fb224..f212b93 100644
--- a/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
+++ b/epdc-resident-mp-yushan/pages/toRegister/toRegister.js
@@ -21,7 +21,11 @@ Page({
       }
     })
     let that = this 
+<<<<<<< HEAD
     const versionNum = '1.2.5'
+=======
+    const versionNum = '1.2.4'
+>>>>>>> 743467732ad0e89a64f1e2e666e7c64845bb659d
     api.getScanSwitch(versionNum).then(function (res) {
       console.log(res.data)
       let state = res.data.scanFlag
@@ -42,9 +46,9 @@ Page({
     // })
   },
   experience() {
-    app.globalData.tempGridId = '1258691044142047233'   // 1222032503139762178
+    app.globalData.tempGridId = '1261183379400663042'   // 1222032503139762178
     wx.reLaunch({
-      url: '/pages/index/index?scene=1258691044142047233'
+      url: '/pages/index/index?scene=1261183379400663042'
     })
   },
   scan() {