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

dev_static
杨树明 5 years ago
commit 963f25258d

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

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