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

doum

16 小时以前 6cf36f0e43c9add691b9a375526ce7dc26209574

 admin/src/layouts/TableLayout.vue

@@ -175,15 +175,15 @@
    }
    // 分页
    .table-pagination {
      margin-left: -18px;
      padding: 16px 0px 16px 25px;
      margin-left: 0px;
      padding: 16px 0px;
      text-align: left;
      display: block;
      z-index: 100;
      width: -webkit-fill-available;
      /* width: 80%; */
      position: fixed;
      bottom: 25px;
      bottom: 0px;
      background-color: white;
      margin-right: 50px;
    }