Merge remote-tracking branch 'origin/master'

resources/views/admin/sta/sta_all.blade.php

@@ -20,12 +20,12 @@
                     <div class="box-header with-border" style="text-align: center">
                         <h1 class="box-title">成本审计汇总表</h1>
                     </div>
-                    <div class="box-body" style="overflow-y: scroll;">
+                    <div class="box-body" style="overflow: scroll;height: 600px;">
                         <table class="table table-bordered table-striped" style="width: 3500px;">
                             <thead>
-                            <tr>
-                                <td colspan="31" style="font-size: 25px; text-align: center">街坊项目拆迁统计表</td>
-                            </tr>
+                            {{--<tr>--}}
+                                {{--<td colspan="31" style="font-size: 25px; text-align: center">街坊项目拆迁统计表</td>--}}
+                            {{--</tr>--}}
                             <tr>
                                 @for($i=1;$i<32;$i++)
                                     <td>{{ $i }}</td>