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 into dev

Browse Source 
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
	ruoyi-ui/package.json
	ruoyi-ui/src/main.js
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/vue.config.js
This commit is contained in:
疯狂的狮子li
2021-12-20 09:47:56 +08:00
parent 08f4ae04e1 ca2405c104
commit a3504dac6e
7 changed files with 125 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/system/menu/index.vue
View File

@ -128,7 +128,7 @@
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.menuType != 'F'">
<el-form-item label="菜单图标">
<el-form-item label="菜单图标" prop="icon">
<el-popover
placement="bottom-start"
width="460"