疯狂的狮子li
|
3aaff7b776
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/main.js
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/index.vue
|
2020-08-12 10:16:29 +08:00 |
|
RuoYi
|
a78211ca00
|
优化上级菜单不能选择自己
|
2020-08-10 12:20:52 +08:00 |
|
疯狂的狮子li
|
c7785d1dbc
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
README.md
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
ruoyi-ui/src/utils/request.js
|
2020-08-05 09:42:03 +08:00 |
|
RuoYi
|
21d07c1d71
|
修复角色的权限分配后，未实时生效问题
|
2020-08-04 11:51:25 +08:00 |
|
疯狂的狮子li
|
1e79d6f56f
|
同步升级3.0
|
2020-07-20 10:41:32 +08:00 |
|
RuoYi
|
cee572f237
|
若依 3.0
|
2020-07-19 10:25:40 +08:00 |
|