Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/components/table/userTable.vue

@@ -3,7 +3,7 @@
     <el-row :gutter="20">
       <!--部门数据-->
       <!--用户数据-->
-      <el-col :span="20" :xs="24">
+      <el-col :span="24" :xs="24">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
           <el-form-item label="用户名称" prop="userName">
             <el-input
@@ -584,4 +584,4 @@ export default {
     }
   }
 };
-</script>
+</script>