Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

 Conflicts:

	pom.xml

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

	ruoyi-admin/src/main/resources/application.yml

	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java

	ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml

	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

	ruoyi-ui/babel.config.js

	ruoyi-ui/package.json

	ruoyi-ui/src/api/tool/gen.js

	ruoyi-ui/src/assets/styles/ruoyi.scss

	ruoyi-ui/src/components/HeaderSearch/index.vue

	ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue

	ruoyi-ui/src/main.js

	ruoyi-ui/src/utils/ruoyi.js

	ruoyi-ui/src/views/login.vue

	ruoyi-ui/src/views/monitor/job/index.vue

	ruoyi-ui/src/views/monitor/logininfor/index.vue

	ruoyi-ui/src/views/monitor/online/index.vue

	ruoyi-ui/src/views/monitor/operlog/index.vue

	ruoyi-ui/src/views/system/config/index.vue

	ruoyi-ui/src/views/system/dept/index.vue

	ruoyi-ui/src/views/system/dict/data.vue

	ruoyi-ui/src/views/system/dict/index.vue

	ruoyi-ui/src/views/system/menu/index.vue

	ruoyi-ui/src/views/system/notice/index.vue

	ruoyi-ui/src/views/system/post/index.vue

	ruoyi-ui/src/views/system/role/index.vue

	ruoyi-ui/src/views/system/user/index.vue

	ruoyi-ui/src/views/tool/gen/genInfoForm.vue

	ruoyi-ui/src/views/tool/gen/index.vue

	ruoyi-ui/vue.config.js

	sql/ry_20200724.sql

ruoyi-ui/src/views/system/post/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="岗位编码" prop="postCode">
         <el-input
           v-model="queryParams.postCode"
@@ -30,7 +30,7 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -74,6 +74,14 @@
           v-hasPermi="['system:post:export']"
         >导出</el-button>
       </el-col>
+      <div class="top-right-btn">
+        <el-tooltip class="item" effect="dark" content="刷新" placement="top">
+          <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
+        </el-tooltip>
+        <el-tooltip class="item" effect="dark" :content="showSearch ? '隐藏搜索' : '显示搜索'" placement="top">
+          <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
+        </el-tooltip>
+      </div>
     </el-row>
 
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
@@ -107,7 +115,7 @@
         </template>
       </el-table-column>
     </el-table>
-
+    
     <pagination
       v-show="total>0"
       :total="total"
@@ -164,6 +172,8 @@ export default {
       single: true,
       // 非多个禁用
       multiple: true,
+      // 显示搜索条件
+      showSearch: true,
       // 总条数
       total: 0,
       // 岗位表格数据
@@ -320,4 +330,4 @@ export default {
     }
   }
 };
-</script>
+</script>