Merge branch 'master' of http://git.imohe.com/zhaozengyu/tzt-admin

# Conflicts:
#	app/Admin/routes.php

app/Admin/routes.php

@@ -28,12 +28,15 @@
     $router->resource('pharmacy', 'PharmacyController');
     $router->resource('pharmacy', 'PharmacyController');
     // 药师
     // 药师
     $router->resource('pharmacist', 'PharmacistController');
     $router->resource('pharmacist', 'PharmacistController');
-    //标签
+    // 标签
     $router->resource('tag', 'TagController');
     $router->resource('tag', 'TagController');
     //医师纠错
     //医师纠错
     $router->resource('doctor_correction', 'DoctorCorrectionController');
     $router->resource('doctor_correction', 'DoctorCorrectionController');
     //药店纠错
     //药店纠错
     $router->resource('pharmacy_correction', 'PharmacyCorrectionController');
     $router->resource('pharmacy_correction', 'PharmacyCorrectionController');
+    // 设置
+    $router->resource('site-config', 'SiteConfigController');
+
     // 导入日志
     // 导入日志
     $router->resource('/import-log', 'Common\ImportLogController')->names('import-log');
     $router->resource('/import-log', 'Common\ImportLogController')->names('import-log');
 });
 });