From 06be1c7ccc7533612e4cc7b0e730080d0dd3d2a1 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Fri, 16 Jan 2026 11:43:36 +0800
Subject: [PATCH] 商品可以赠送优惠券 商品属性增加团购 入驻商家增加实物和团购选项 团购和实物商户分类分开 增加团购商家页面 后台添加页面增加团购组件
---
admin/app/shop/model/user/User.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/admin/app/shop/model/user/User.php b/admin/app/shop/model/user/User.php
index 948f542..7077768 100644
--- a/admin/app/shop/model/user/User.php
+++ b/admin/app/shop/model/user/User.php
@@ -94,7 +94,7 @@
}
if($is_page){
// 获取用户列表
- return $model->alias('user')->with(['grade'])->distinct(true)->field(['user.*','referee.nickName as referee_name,referee.avatarUrl as referee_avatarUrl'])
+ return $model->alias('user')->with(['grade','branch'])->distinct(true)->field(['user.*','referee.nickName as referee_name,referee.avatarUrl as referee_avatarUrl'])
->where('user.is_delete', '=', '0')
->join('user_tag tag', 'user.user_id = tag.user_id','left')
->join('user referee', 'user.referee_id = referee.user_id','left')
@@ -103,7 +103,7 @@
->paginate($params);
}else{
// 获取用户列表
- return $model->alias('user')->with(['grade'])
+ return $model->alias('user')->with(['grade','branch'])
->where('user.is_delete', '=', '0')
->join('user referee', 'user.referee_id = referee.user_id','left')
->order(['user.create_time' => 'desc'])
--
Gitblit v1.9.2