Merge branch 'develop'

2025-10-12 17:10:14 +08:00
parent 3a7449e2e9
commit 89d633389c
43 changed files with 4173 additions and 364 deletions
@@ -75,6 +75,7 @@ class ApprovalInstances extends Model
    // ====== ====== ====== 映射业务表 ====== ====== ====== 
    protected const BIZ_CLASS = [
        'stock_orders'   => \app\common\model\StockOrders::class,
+        'stock_orders_nullify'   => \app\common\model\StockOrders::class,
        'purchase_orders' => \app\common\model\PurchaseOrders::class,
    ];

@@ -85,7 +86,7 @@ class ApprovalInstances extends Model

    public function bizInfo()
    {
-        return $this->morphTo('bizInfo', 'biz_type', 'biz_id');
+        return $this->morphTo('bizInfo', 'biz_type', 'biz_id')->withTrashed();
    }
    // ====== ====== ====== 映射表业务 ====== ====== ======