Change the merchant_remark of order into manager_remark

db/migrate/1_create_shotengai_products_and_orders.rb

@@ -57,7 +57,7 @@ class CreateShotengaiProductsAndOrders < ActiveRecord::Migration[5.1]
       t.datetime :receipt_time
       t.string :delivery_way
       t.integer :delivery_cost, default: 0
-      t.text :merchant_remark
+      t.json :manager_remark
       t.string :mark # merchant mark, like red, blue ..
       t.text :customer_remark
       t.string :status

lib/generators/templates/views/share/_merchant_order.json.jbuilder

@@ -3,6 +3,6 @@ json.extract! order, :id, :seq, :address, :amount,
   :total_price, :total_original_price, 
   :pay_time, :delivery_time, :receipt_time, 
   :delivery_way, :delivery_cost, 
-  :merchant_remark, :mark, :customer_remark, 
+  :manager_remark, :mark, :customer_remark, 
   :status, :status_zh, :meta, :created_at
 json.snapshots order.snapshots, partial: 'shotengai/share/snapshot_simple', as: :snapshot

lib/generators/templates/views/share/_merchant_order_simple.json.jbuilder

@@ -2,6 +2,6 @@ json.extract! order, :id, :seq, :address, :amount
   :product_amount, :product_original_amount, 
   :pay_time, :delivery_time, :receipt_time, 
   :delivery_way, :delivery_cost, 
-  :merchant_remark, :mark, :customer_remark, 
+  :manager_remark, :mark, :customer_remark, 
   :status, :status_zh, :meta, :created_at
 json.snapshots order.snapshots, partial: 'shotengai/share/snapshot_simple', as: :snapshot

lib/shotengai/controller/merchant/orders_controller.rb

@@ -23,7 +23,7 @@ module Shotengai
         private
           def resource_params
             params.require(resource_key).permit(
-              :merchant_remark, :mark
+              :mark, manager_remark: [],
             )
           end