Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

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%}';
 
 }

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()];
     }