Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/config-manage into develop

app/Http/Controllers/ConfigCityManagementController.php

@@ -3,6 +3,7 @@ namespace App\Http\Controllers;
 use App\Repositories\ConfigCityManagementRepository;
 use App\Transformers\CityTransformer;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Validator;
 use League\Fractal\Pagination\IlluminatePaginatorAdapter;
 use League\Fractal\Resource\Collection;
@@ -27,6 +28,7 @@ class ConfigCityManagementController extends Controller
     {
 
         $cityList = $this->configCityManagementRepository->index($request->all());
+        Log::info('1.---'.$cityList);
 
         if (count($cityList) > 0) {
             foreach ($cityList as $k => $v) {
@@ -50,6 +52,7 @@ class ConfigCityManagementController extends Controller
         $resource = new Collection($cityList, new CityTransformer());
         $resource->setPaginator(new IlluminatePaginatorAdapter($cityList));
         $data = $fractal->createData($resource)->toArray();
+        Log::info('2.---'.$data);
         $data['extra'] = [
             'filters' => [
                 'id'