Merge branch 'dev20230707' of http://192.168.60.201/root/dsk-operate-sys into dev20230707

# Conflicts:
#	dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -148,7 +148,7 @@
 		  <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
 
 			<div class=" table-item-jf table-item " v-if="!isSkeleton&&tableData.length>0">
-			  <el-table  :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" max-height="640"  class="table-item1 fixed-table"  border  highlight-current-row>
+			  <el-table  :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"  class="table-item1 fixed-table"  border  highlight-current-row>
 					<el-table-column type="index" label="序号" fixed width="60">
 					 <template slot-scope="scope">
 						 <span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>