Merge branch 'zjl_add_role_20181017' into development

app/Http/Controllers/PermController.php

@@ -57,6 +57,8 @@
 							return 6;
 						} else if ($department->name == '自营客服') {
 							return 7;
+						} else if ($department->name == '运营助理') {
+							return 8;
 						} else {
 							return 0;
 						}

resources/views/detail/sendSales.blade.php

@@ -77,8 +77,8 @@
                     </td>
                 </tr>
                 
-                <!-- 查看权限：当前推送人或管理员、经理、测试 -->
-                @if ($sale_id == $order_info['sale_id'] || in_array($role, [1, 2, 5]))
+                <!-- 查看权限：当前推送人或管理员、经理、测试、运营助理 -->
+                @if ($sale_id == $order_info['sale_id'] || in_array($role, [1, 2, 5, 8]))
                 <tr>
                     <td class="check-table-title" width="20%">备注信息：</td>
                     <td>