Conflicts: ruoyi/sql/ry_20200629.sql ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java