Merge branch 'zjl_adjust_20181026' into development

app/Http/Controllers/PermController.php

@@ -63,6 +63,8 @@
 				if (empty($userPerm)) {
 					return 0;
 				} else {
+					if ($userPerm->roles == 'null') return 0;
+					
 					$role = json_decode($userPerm->roles, true);
 					
 					foreach ($role as $v) {

app/Model/OrderModel.php

@@ -17,6 +17,9 @@ class OrderModel extends Model
 	// 订单导出
 	public function orderExport($request, $info)
 	{
+        set_time_limit(300); 
+        ini_set('memory_limit', '512M');
+        
 		$map = array();
 
         $userMainModel = new UserMainModel();