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

疯狂的狮子li

2020-09-25 6101a3bf0d3f7e8de375a0b9bfa7ce71a111144c

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

@@ -90,7 +90,7 @@
          v-hasPermi="['monitor:job:export']"
        >导出</el-button>
      </el-col>
      <table-tools-ext :showSearch.sync="showSearch" @queryTable="getList"></table-tools-ext>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="jobLogList" @selection-change="handleSelectionChange">