Merge branch 'yuanke' into develop

2016-04-14 13:56:42 +08:00 · 2016-04-14 13:56:42 +08:00 · de0ba0fbe5
parent fddf03d80c 6444d859a7
commit de0ba0fbe5
2 changed files with 6 additions and 6 deletions
--- a/db/migrate/20160330094039_add_simi_id_to_homeworks.rb
+++ b/db/migrate/20160330094039_add_simi_id_to_homeworks.rb
@ -1,6 +0,0 @@
-class AddSimiIdToStudentWorks < ActiveRecord::Migration
-  def change
-    add_column :student_works, :simi_id, :integer, :default => false
-    add_column :student_works, :simi_value, :integer, :default => false
-  end
-end
--- a/db/migrate/20160414055511_add_simi_id_to_student_works.rb
+++ b/db/migrate/20160414055511_add_simi_id_to_student_works.rb
@ -0,0 +1,6 @@
+class AddSimiIdToStudentWorks < ActiveRecord::Migration
+  def change
+    add_column :student_works, :simi_id, :integer
+    add_column :student_works, :simi_value, :integer
+  end
+end