Merge remote-tracking branch 'origin/develop'

This commit is contained in:
monanxiao 2023-03-14 18:04:20 +08:00
commit e2f3d18e7e

View File

@ -35,7 +35,7 @@ trait CategoresRepository
*/
public function getApiFormatList($merID,$status = null, $source = 2)
{
return formatCategory($this->dao->getAll($merID,$status)->hidden(['path','level','mer_id','create_time'])->toArray(), $this->dao->getPk());
return formatCategory($this->dao->getAll($merID,$status,$source)->hidden(['path','level','mer_id','create_time'])->toArray(), $this->dao->getPk());
}
/**