Merge branch 'wangyang' of ssh://47.103.131.176:10022/var/git/bswas into wangyang

 Conflicts:

	app/Http/Controllers/TestController.php

database/migrations/2021_07_07_144202_create_delivery_types_table.php

@@ -4,7 +4,7 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-class CreateDeliveryTypeTable extends Migration
+class CreateDeliveryTypesTable extends Migration
 {
     /**
      * Run the migrations.
@@ -20,6 +20,14 @@ class CreateDeliveryTypeTable extends Migration
             $table->softDeletes();
             $table->timestamps();
         });
+        $arr = ['自提','送货进仓','送货（不含上楼）','送货上楼','大件上楼'];
+        foreach ($arr as $v) {
+            \Illuminate\Support\Facades\DB::insert(
+                \Illuminate\Support\Facades\DB::raw("INSERT INTO delivery_types(name,status,created_at) VALUES(?,?,?)")
+                ,[ $v, '0', date("Y-m-d H:i:s")]
+            );
+        }
+
     }
 
     /**