提交的内容

2025-05-12 15:45:02 +08:00
parent 629c4750da
commit b48c692775
3043 changed files with 34732 additions and 60810 deletions
--- a/vendor/topthink/think-orm/src/model/Relation.php
+++ b/vendor/topthink/think-orm/src/model/Relation.php
@ -163,7 +163,7 @@ abstract class Relation
     *
     * @return mixed
     */
-    protected function resultSetBuild(array $resultSet, Model $parent = null)
+    protected function resultSetBuild(array $resultSet, ?Model $parent = null)
    {
        return (new $this->model())->toCollection($resultSet)->setParent($parent);
    }