jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
 Conflicts:
	ruoyi/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
This commit is contained in:
疯狂的狮子li
2020-06-18 15:13:40 +08:00
parent db380f9af1 a195df175f
commit 8d318c222e
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/monitor/job/log.vue
View File

@ -87,7 +87,7 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['monitor:jobLog:export']"
v-hasPermi="['monitor:job:export']"
>导出</el-button>
</el-col>
</el-row>