From 817842bb5b97083e5e355c6ceb7c5b2689675e0e Mon Sep 17 00:00:00 2001
From: liwen <408815583@qq.com>
Date: Thu, 12 Mar 2020 19:35:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=BB=E9=87=8F2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/task_status.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/models/task_status.rb b/app/models/task_status.rb
index 9a0231b..39b8bd2 100644
--- a/app/models/task_status.rb
+++ b/app/models/task_status.rb
@@ -1,5 +1,14 @@
 class TaskStatus < ApplicationRecord
   belongs_to :task_category
+
+>>>>>>>>>>>>
+  def set_name
+  end
+============
+  def get_name
+  end
+
+<<<<<<<<<<<<
 end
 
 # == Schema Information
-- 
Gitee