Merge branch 'Haozi'

# Conflicts:
#	public/js/app.js

resources/views/personnel/laborReport/index.blade.php

@@ -18,7 +18,7 @@
                     <a class="dropdown-item" @click="laborReportExport(true)" href="javascript:">导出所有页</a>
                 </div>
             </span>
-        <table class="table table-sm table-hover table-striped d-none d-sm-block p-0 text-nowrap table-bordered" >
+        <table class="table table-sm table-hover table-striped d-none d-xl-block p-0 text-nowrap table-bordered" >
             <tr>
                 <th class="text-center">
                     <label for="all">