fix conflit

2017-08-28 18:22:32 +06:30
parent 1cbea173df 0369cd6646
commit 63d97cce26
26 changed files with 644 additions and 253 deletions
--- a/db/migrate/20170403140820_create_order_items.rb
+++ b/db/migrate/20170403140820_create_order_items.rb
@@ -6,6 +6,7 @@ class CreateOrderItems < ActiveRecord::Migration[5.1]
      t.string :order_item_status, :null => false, :default => "new"
      t.string :item_order_by #person who order this
      t.string :item_code, :null => false
+      t.string :item_instance_code
      t.string :item_name, :null => false
      t.string :alt_name, :null => false
      t.integer :account_id, :limit => 8, :null => false, :default => 1