Merge remote-tracking branch 'origin/dev' into dev

a1eb4f5e · suichenguang · 6d1460bb · b9805089 · a1eb4f5e
Commit a1eb4f5e authored Mar 10, 2019 by suichenguang
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

excelAndSearch.html ...resources/static/views/excelAndSearch/excelAndSearch.html +1 -1

No files found.
--- a/src/main/resources/static/views/excelAndSearch/excelAndSearch.html
+++ b/src/main/resources/static/views/excelAndSearch/excelAndSearch.html
@@ -140,7 +140,7 @@
                    </tr>
                    </tbody>
                </table>
-            <div style="padding-left: 27%;" >
+            <div style="padding-left: 27%;" ng-if="postPackageData>0">
                <tm-pagination  conf="paginationConf" class="ul"></tm-pagination>
            </div>
            <div class="box-body" ng-if="postPackageData.length==0"><h4>暂无记录</h4></div>