From 599abed702db9fa5dec90b5660ff039acb6eace7 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 24 Nov 2025 18:33:29 +0800
Subject: [PATCH] 1、完成升级赠送价值400元(共40张)平台消费券,每张10元,每次消费只能用一张,消费金额满200元抵一张10元消费券 1、修复分享名片第一次进入是空白 3、修复分红订单不生成问题

---
 admin/app/shop/model/branch/Activity.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/admin/app/shop/model/branch/Activity.php b/admin/app/shop/model/branch/Activity.php
index 5761a24..a6fb08e 100644
--- a/admin/app/shop/model/branch/Activity.php
+++ b/admin/app/shop/model/branch/Activity.php
@@ -15,7 +15,7 @@
      */
     public function getList($params)
     {
-        return $this->with(['image', 'category'])
+        return $this->with(['image', 'category', 'branch'])
             ->where('is_delete', '=', 0)
             ->order(['sort' => 'desc', 'create_time' => 'desc'])
             ->paginate($params);

--
Gitblit v1.9.2