From fa15a01ac2ea5c530a41ea473b9045afbab92a91 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Sun, 23 Apr 2023 10:27:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A8=A1=E5=9E=8B=E4=B8=BB=E9=94=AE=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/crmeb/services/crud/stubs/model/CrudModel.stub       | 3 ++-
 crmeb/crmeb/services/crud/stubs/service/CrudListIndex.stub | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/crmeb/crmeb/services/crud/stubs/model/CrudModel.stub b/crmeb/crmeb/services/crud/stubs/model/CrudModel.stub
index 924d79406..bea6353df 100644
--- a/crmeb/crmeb/services/crud/stubs/model/CrudModel.stub
+++ b/crmeb/crmeb/services/crud/stubs/model/CrudModel.stub
@@ -36,8 +36,9 @@ class {%nameCamel%} extends BaseModel
     protected $name = '{%name%}';
 
     /**
+     * 主键
      * @var string
      */
-    protected $key = '{%key%}';
+    protected $pk = '{%key%}';
 
 }
diff --git a/crmeb/crmeb/services/crud/stubs/service/CrudListIndex.stub b/crmeb/crmeb/services/crud/stubs/service/CrudListIndex.stub
index 48e644d9e..4761b01d2 100644
--- a/crmeb/crmeb/services/crud/stubs/service/CrudListIndex.stub
+++ b/crmeb/crmeb/services/crud/stubs/service/CrudListIndex.stub
@@ -7,7 +7,7 @@
     public function getCrudListIndex(array $where = [])
     {
         [$page, $limit] = $this->getPageValue();
-        $model = $this->dao->selectModel($where, '*', $page ?: 1, $limit ?: 10, '{%key%} desc');
+        $model = $this->dao->selectModel($where, '*', 0, 0, '{%key%} desc');
 
-        return ['count' => $model->count(), 'list' => $model->select()->toArray()];
+        return ['count' => $model->count(), 'list' => $model->page($page ?: 1, $limit ?: 10)->select()->toArray()];
     }