From 225a632504a21e8897b6fc0bb1cbb80f79c8fe92 Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@easycorp.ltd>
Date: Thu, 10 Aug 2023 17:03:00 +0800
Subject: [PATCH] * Fix bug.

---
 module/bug/model.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/module/bug/model.php b/module/bug/model.php
index 45db8dde1c..1da8fbe49c 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -2064,16 +2064,11 @@ class bugModel extends model
             ->andWhere('deleted')->eq(0)
             ->orderBy('id desc')
             ->beginIF($limit)->limit($limit)->fi()
-<<<<<<< Updated upstream
             ->fetchAll();
 
         foreach($data as $bug) $bugs[$bug->id] = $bug->id . ':' . $bug->title;
-        return $bugs;
-=======
-            ->fetchPairs();
 
-        return array('' => '') + $bugs;
->>>>>>> Stashed changes
+        return $bugs;
     }
 
     /**