Merge branch 'dev' of http://git.singsingenglish.com/new-sing/admin into dev

src/components/callBack/index.vue

@@ -388,7 +388,7 @@
           this.getData();
           if (this.callbackObj.teacher_id) {
             let json = {
-              user_id: this.user.user_id
+              user_id: this.callbackObj.user_id
             }
             getCallBackPrevApi(json).then(res => {
               if (res && res[0] && res[0].next_visit_at && res[0].intention) {