修复补丁 表中增加注释造成的无法迁移的补丁

wmhello · wmhello · commit 8269b6a8e497 · 2018-02-26T12:15:18.000+08:00
diff --git a/backend/database/migrations/2018_02_24_140731_create_teachers_table.php b/backend/database/migrations/2018_02_24_140731_create_teachers_table.php
@@ -30,12 +30,12 @@ public function up()
             $table->unsignedTinyInteger('state')->comment('人员状态(1->正常 2->调出 3->退出 4->停薪留职)')->default(1);
             $table->unsignedTinyInteger('teaching_id')->comment('教学科目Id')->nullable;
             $table->timestamps();
-            $table->comment('教职工信息表');
             $table->unique('card_id');
             $table->unique('phone');
             $table->unique('phone2');
-            $table->foreign('teaching_id')->reference('id')->on('yz_teaching');
-            $table->foreign('nation_id')->reference('id')->on('yz_nation');
+            // 要设置外键的话  必须先保证相应的表格先存在
+            // $table->foreign('teaching_id')->reference('id')->on('yz_teaching');
+            // $table->foreign('nation_id')->reference('id')->on('yz_nation');
         });
     }
 
diff --git a/backend/database/seeds/DatabaseSeeder.php b/backend/database/seeds/DatabaseSeeder.php
@@ -14,5 +14,6 @@ public function run()
         $this->call(UsersTableSeeder::class);
         $this->call(RolesTableSeeder::class);
         $this->call(SessionsTableSeeder::class);
+        $this->call(PermissionsTableSeeder::class);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,6 @@ public function run()`
`14`	`14`	`$this->call(UsersTableSeeder::class);`
`15`	`15`	`$this->call(RolesTableSeeder::class);`
`16`	`16`	`$this->call(SessionsTableSeeder::class);`
	`17`	`+ $this->call(PermissionsTableSeeder::class);`
`17`	`18`	`}`
`18`	`19`	`}`