Merge branch 'zjl_exception_20181221' into development

resources/views/selfOrder/content.blade.php

@@ -159,7 +159,7 @@
                         <div class="search-btn">
                             <button class="nbtn search_self_order">搜索</button>
 
-                            @if (in_array('export', $userPerms))
+                            @if (in_array('self_order_export', $userPerms))
                                 <button class="nbtn self_export" style="margin-left: 20px; background: #23c6c8 !important;">导出</button>
                             @endif
                         </div>