Merge branches 'dev_aliyun' and 'dev_new_shixunsrepository' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_new_shixunsrepository

app/controllers/graduation_tasks_controller.rb

@@ -216,6 +216,7 @@ class GraduationTasksController < ApplicationController
     tip_exception(403, "无权限访问") unless current_user.admin_or_business?
 
     _tasks_list
+    @work_list = @work_list.where("work_status > 0")
 
     person_list = @work_list.map do |work|
       o = {

db/migrate/20200107125721_migrate_zip_pack_column.rb

@@ -0,0 +1,5 @@
+class MigrateZipPackColumn < ActiveRecord::Migration[5.2]
+  def change
+    change_column :zip_packs, :pack_size, :float
+  end
+end