From 34db7035c9c7880e00b9328d022be65a29c62cb2 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期一, 31 七月 2023 10:40:56 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.5接口' into develop
---
application/api/logic/Banner.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/application/api/logic/Banner.php b/application/api/logic/Banner.php
index 1de8cfc..ae5b3ef 100644
--- a/application/api/logic/Banner.php
+++ b/application/api/logic/Banner.php
@@ -30,7 +30,7 @@
$where['status'] = 1;
$where['start_time'] = ['<=',time()];
$where['end_time'] = ['>',time()];
- $list = $this->model->field('id,type,image,url_type,url,colour,parameter_json')->where($where)->whereIn('type',$type_arr)->order('sort desc')->select();
+ $list = $this->model->field('id,type,image,url_type,url,colour,note,parameter_json')->where($where)->whereIn('type',$type_arr)->order('sort desc')->select();
$return_data = [
'topBannerList'=>[],
'singleLineList'=>[],
--
Gitblit v1.9.3