From 8097531dbb9ae6d03a5696ca3541aca53edb6a08 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Sat, 20 Jul 2019 01:29:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20190705085829_add_sec_key_to_outputs.rb | 2 ++
 db/migrate/20190716062401_add_ts_time_to_outputs.rb | 5 -----
 db/migrate/20190718100242_add_ts_mem_to_outputs.rb  | 5 -----
 3 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 db/migrate/20190716062401_add_ts_time_to_outputs.rb
 delete mode 100644 db/migrate/20190718100242_add_ts_mem_to_outputs.rb

diff --git a/db/migrate/20190705085829_add_sec_key_to_outputs.rb b/db/migrate/20190705085829_add_sec_key_to_outputs.rb
index 428fbaced..df4d59be0 100644
--- a/db/migrate/20190705085829_add_sec_key_to_outputs.rb
+++ b/db/migrate/20190705085829_add_sec_key_to_outputs.rb
@@ -1,5 +1,7 @@
 class AddSecKeyToOutputs < ActiveRecord::Migration[5.2]
   def change
     add_column :outputs, :sec_key, :string
+    add_column :outputs, :ts_mem, :float
+    add_column :outputs, :ts_time, :float
   end
 end
diff --git a/db/migrate/20190716062401_add_ts_time_to_outputs.rb b/db/migrate/20190716062401_add_ts_time_to_outputs.rb
deleted file mode 100644
index 8e0c55a78..000000000
--- a/db/migrate/20190716062401_add_ts_time_to_outputs.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddTsTimeToOutputs < ActiveRecord::Migration[5.2]
-  def change
-    add_column :outputs, :ts_time, :float
-  end
-end
diff --git a/db/migrate/20190718100242_add_ts_mem_to_outputs.rb b/db/migrate/20190718100242_add_ts_mem_to_outputs.rb
deleted file mode 100644
index 70b593a35..000000000
--- a/db/migrate/20190718100242_add_ts_mem_to_outputs.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class AddTsMemToOutputs < ActiveRecord::Migration[5.2]
-  def change
-    add_column :outputs, :ts_mem, :float
-  end
-end