From ec21080e9132fc3e7dd707690f22ec525072c31a Mon Sep 17 00:00:00 2001
From: anke1460 <zuosjob@gmail.com>
Date: Thu, 27 Feb 2020 23:36:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=88=86=E7=8F=AD=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb  | 4 ++--
 lib/tasks/tfxy.rake | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 6fac73416..5c22f46e7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -118,8 +118,8 @@ class User < ApplicationRecord
   has_many :manage_courses, through: :manage_course_members, source: :course
 
   # 关注
-  has_many :be_watchers, foreign_key: :user_id, dependent: :destroy # 我的关注
-  has_many :be_watcher_users, through: :be_watchers, dependent: :destroy # 我关注的用户
+  # has_many :be_watchers, foreign_key: :user_id, dependent: :destroy # 我的关注
+  # has_many :be_watcher_users, through: :be_watchers, dependent: :destroy # 我关注的用户
 
   # 认证
   has_many :apply_user_authentication
diff --git a/lib/tasks/tfxy.rake b/lib/tasks/tfxy.rake
index 8bfe8635c..fb7aea644 100644
--- a/lib/tasks/tfxy.rake
+++ b/lib/tasks/tfxy.rake
@@ -103,7 +103,7 @@ namespace :tfxy do
         end
 
         course_group.position = course.course_groups_count + 1
-        course_group.name = "#{course_data.cell(r, 2)}#{course_data.cell(r, 3)}"
+        course_group.name = course_data.cell(r, 4)
         course_group.course = course
 
         course_group.save!