diff --git a/database/migrations/2022_05_30_174005_add_sub_money_to_order_profits.php b/database/migrations/2022_05_30_174005_add_sub_money_to_order_profits.php deleted file mode 100644 index 0b24d0b6..00000000 --- a/database/migrations/2022_05_30_174005_add_sub_money_to_order_profits.php +++ /dev/null @@ -1,32 +0,0 @@ -decimal('sub_money', 12, 2)->default(0)->comment('下级收益')->after('money'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('order_profits', function (Blueprint $table) { - $table->dropColumn(['sub_money']); - }); - } -} diff --git a/database/seeders/AdminPermissionSeeder.php b/database/seeders/AdminPermissionSeeder.php index ef765794..8e4eff3f 100644 --- a/database/seeders/AdminPermissionSeeder.php +++ b/database/seeders/AdminPermissionSeeder.php @@ -434,7 +434,7 @@ class AdminPermissionSeeder extends Seeder } if (count($permission['children']) > 0) { $_key = (isset($permission['curd']) && $permission['curd']) ? ($key ? $key.'.'.$slug : $slug) : $key; - $this->createPermissionData($permission['children'], $_key ?? $slug, $pper->id); + $this->createPermissionData($permission['children'], $_key ?: $slug, $pper->id); } } }