From 42656637015b6b396817a8197c597bdf6cc65e18 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Wed, 10 Aug 2022 11:43:44 +0800
Subject: [PATCH] add merchant

---
 packages/goods/src/Models/Goods.php         | 1 -
 packages/goods/updates/CreateGoodsTable.php | 1 -
 packages/merchant                           | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)
 create mode 160000 packages/merchant

diff --git a/packages/goods/src/Models/Goods.php b/packages/goods/src/Models/Goods.php
index 1c8524b..cffef68 100644
--- a/packages/goods/src/Models/Goods.php
+++ b/packages/goods/src/Models/Goods.php
@@ -9,7 +9,6 @@ use Peidikeji\Goods\Filters\GoodsFilter;
 
 class Goods extends Model
 {
-    use SoftDeletes;
     use Filterable;
 
     protected $table = 'goods';
diff --git a/packages/goods/updates/CreateGoodsTable.php b/packages/goods/updates/CreateGoodsTable.php
index aa987f2..37471a5 100644
--- a/packages/goods/updates/CreateGoodsTable.php
+++ b/packages/goods/updates/CreateGoodsTable.php
@@ -65,7 +65,6 @@ class CreateGoodsTable extends Migration
             $table->json('spec')->nullable()->comment('规格[{name, values: [{name, value}]}]');
             $table->json('part')->nullable()->comment('配件[{name, values: [{name, value}]}]');
             $table->timestamps();
-            $table->softDeletes();
 
             $table->foreign('category_id')->references('id')->on('goods_category');
             $table->foreign('type_id')->references('id')->on('goods_type');
diff --git a/packages/merchant b/packages/merchant
new file mode 160000
index 0000000..2b3e329
--- /dev/null
+++ b/packages/merchant
@@ -0,0 +1 @@
+Subproject commit 2b3e329a33bea20dc39d5c869faf0fb8f7e96e4d