Merge branch 'dev' of https://gitea.lihaink.cn/mkm/shop-new into dev
This commit is contained in:
commit
09b800960e
@ -41,7 +41,7 @@ class MerchantIntentionRepository extends BaseRepository
|
||||
|
||||
public function getList(array $where, $page, $limit)
|
||||
{
|
||||
// $where['type'] = [1,2];
|
||||
$where['type'] = [1,2];
|
||||
$query = $this->dao->search($where);
|
||||
$count = $query->count();
|
||||
$list = $query->page($page, $limit)->order('create_time DESC , status ASC')->with(['merchantCategory', 'merchantType'])->select();
|
||||
|
Loading…
x
Reference in New Issue
Block a user