使用最新分支控制

2019-09-05 10:05:27 +08:00
parent 075c1036eb
commit e88ea9fb8f
2327 changed files with 2358 additions and 2498 deletions
--- a/composer.json
+++ b/composer.json
@@ -18,6 +18,7 @@
    "require": {
        "php": ">=7.1.0",
        "topthink/framework": "6.0.*-dev",
+        "topthink/think-orm": "2.0.*-dev",
        "topthink/think-view": "^1.0"
    },
    "require-dev": {