业务员订单筛选问题

@@ -204,13 +204,8 @@ class WeChatBaseController extends BaseController
      */
      */
     public function checkWeChatUserLogin()
     public function checkWeChatUserLogin()
     {
     {
-<<<<<<< HEAD
-//        $user = Db::name('user')->where('id',4)->find();
+//        $user = Db::name('user')->where('id',5)->find();
 //        cmf_update_current_user($user);
 //        cmf_update_current_user($user);
-=======
-        /*$user = Db::name('user')->where('id',5)->find();
-        cmf_update_current_user($user);*/
->>>>>>> 519483a8ea7d8435b0c84d0f2d956c6de1b06ec3
         $userId = cmf_get_current_user_id();
         $userId = cmf_get_current_user_id();
         if (empty($userId)) {
         if (empty($userId)) {
             $config = [
             $config = [