Merge remote-tracking branch 'origin/educoder' into educoder

db/migrate/20190314080805_create_shixun_student_works.rb

@@ -82,7 +82,7 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
               end
               work.update_column("myshixun_id", myshixun.id)
             else
-              work.update_attributes(:myshixun_id => 0)
+              work.update_attributes(:myshixun_id => 0, :work_status => 0)
             end
           end
         end