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

src/components/normal-basic-layout/index.vue

@@ -48,6 +48,7 @@
           </tableTemp>
           <div class="container normal-panel" style="text-align:right">
             <el-pagination
+              v-if="hidePagination"
               background
               small
               @size-change="handleSizeChange"
@@ -67,7 +68,7 @@
 <script>
 import {mapGetters} from 'vuex'
 export default {
-  props:['tableName','idName','tableData','apiId','formPath','oldFormPath','options','autoQuery','detailPath','customTitle'],
+  props:['tableName','idName','tableData','apiId','formPath','oldFormPath','options','autoQuery','detailPath','customTitle','hidePagination'],
   components:{
     tableTemp: () => import('./modules/table.vue'),
     setColumn: () => import('./modules/setColumn.vue'),