Merge branch 'develop' into dev_aliyun

db/migrate/20200218060225_create_salesmen.rb

@@ -1,6 +1,6 @@
 class CreateSalesmen < ActiveRecord::Migration[5.2]
   def change
-    create_table :salesmen do |t|
+    create_table :salesmans do |t|
       t.references :user
       t.string :name
       t.integer :salesman_channels_count