萤火科技 4 年 前
親
コミット
d7f60a0530
2 ファイル変更、1 行追加、15 行削除
  1. 1 1
      app/admin/model/Store.php
  2. 0 14
      app/common/model/Store.php

+ 1 - 1
app/admin/model/Store.php

@@ -27,7 +27,7 @@ class Store extends StoreModel
      * @return \think\Paginator
      * @return \think\Paginator
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\DbException
      */
      */
-    public function getList(bool $isRecycle = false)
+    public function getList(bool $isRecycle = false): \think\Paginator
     {
     {
         return $this->where('is_recycle', '=', (int)$isRecycle)
         return $this->where('is_recycle', '=', (int)$isRecycle)
             ->where('is_delete', '=', 0)
             ->where('is_delete', '=', 0)

+ 0 - 14
app/common/model/Store.php

@@ -45,18 +45,4 @@ class Store extends BaseModel
     {
     {
         return self::get($storeId, ['logoImage']);
         return self::get($storeId, ['logoImage']);
     }
     }
-
-    /**
-     * 获取列表数据
-     * @param bool $isRecycle 是否在回收站
-     * @return \think\Paginator
-     * @throws \think\db\exception\DbException
-     */
-    public function getList(bool $isRecycle = false): \think\Paginator
-    {
-        return $this->where('is_recycle', '=', (int)$isRecycle)
-            ->where('is_delete', '=', 0)
-            ->order(['create_time' => 'desc', $this->getPk()])
-            ->paginate(15);
-    }
 }
 }