From c17c1c3ddeefe4c3e2d546ccdc2bc5ee887ea6db Mon Sep 17 00:00:00 2001 From: bigrocs Date: Mon, 18 Sep 2017 17:29:22 +0800 Subject: [PATCH] Version update version update --- composer.json | 4 ++-- src/Http/Controllers/Api/ConfigController.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index a126760..6be5b1d 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ ], "require": { "php": "~5.6|~7.0", - "corecmf/admin": "1.1.*", + "corecmf/admin": "1.3.*", "yangyifan/upload": "^0.2.1" }, "require-dev": { @@ -46,7 +46,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.3.0-dev" } }, "config": { diff --git a/src/Http/Controllers/Api/ConfigController.php b/src/Http/Controllers/Api/ConfigController.php index 0b5e1a4..f59c2b2 100644 --- a/src/Http/Controllers/Api/ConfigController.php +++ b/src/Http/Controllers/Api/ConfigController.php @@ -6,7 +6,7 @@ use Illuminate\Container\Container; use App\Http\Controllers\Controller; -use CoreCMF\Admin\Http\Models\Config as adminConfig; +use CoreCMF\Admin\App\Models\Config as adminConfig; use CoreCMF\Storage\Http\Models\Config; use CoreCMF\Storage\Http\Validator\ConfigRules;