Commit Graph

2 Commits

Author SHA1 Message Date
疯狂的狮子li c70ec63952 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi/sql/ry_20200629.sql
	ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
2020-07-01 09:16:25 +08:00
RuoYi 338f661d41 创建用户不允许选择系统管理员角色 2020-06-29 11:44:46 +08:00