Merge branch 'master' of http://192.168.1.222:3000/zhoufan/12345_Base_Web

WebSite/css/indexs.css

@@ -1005,7 +1005,10 @@ ul.acceptance>li>img {
 .pagination {
 	display: block;
 	width: 100%;
-	margin: 20px auto;
+	margin: 5px auto;
+}
+.pagination-detail{
+	margin-top: 8px;
 }
 
 .fixed-table-pagination {