65 Commits

Author SHA1 Message Date
疯狂的狮子li
4bee0d652a 修复前端页面报错 找不到模块问题 2020-04-25 20:09:39 +08:00
疯狂的狮子li
44e2618ee2 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/views/monitor/job/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/system/user/profile/userAvatar.vue
	ruoyi-ui/src/views/tool/gen/importTable.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	ruoyi/sql/ry_20200415.sql
	ruoyi/src/main/java/com/ruoyi/project/system/domain/SysMenu.java
	ruoyi/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java
	ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java
	ruoyi/src/main/resources/mybatis/system/SysMenuMapper.xml
	ruoyi/src/main/resources/vm/sql/sql.vm
	ruoyi/src/main/resources/vm/vue/index.vue.vm
2020-04-21 09:08:48 +08:00
RuoYi
5a4a0e7987 用户名称不能修改 2020-04-17 15:17:32 +08:00
RuoYi
14392d9764 dialog添加append-to-body属性,防止ie遮罩 2020-04-17 14:14:54 +08:00
疯狂的狮子li
a1cf719d26 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi/src/main/java/com/ruoyi/project/system/domain/SysUser.java
2020-02-18 14:47:23 +08:00
RuoYi
b7107a4dba 用户手机邮箱必填&密码参数修改 2020-02-18 11:15:08 +08:00
疯狂的狮子li
2841620be6 初始化项目 2020-02-13 10:48:51 +08:00
疯狂的狮子li
abdb1048ed 删除文件 ruoyi-ui 2020-02-13 10:47:14 +08:00
RuoYi
3755597c76 添加一个默认空属性,用来判断节点显示 2019-12-26 15:59:03 +08:00
RuoYi
b508e6f202 新增用户导入 2019-12-11 18:12:00 +08:00
RuoYi
fee8a5955b 若依 2.0 2019-12-02 09:28:11 +08:00
RuoYi
bcee37b84b 若依 1.1 2019-11-11 08:59:15 +08:00
RuoYi
319dfc2de3 修改函数命名防止冲突 2019-10-09 17:21:43 +08:00
RuoYi
7c908e9a56 用户密码无法修改问题 2019-10-09 10:21:06 +08:00
RuoYi
46444bd0fe RuoYi-Vue 1.0 2019-10-08 09:14:38 +08:00