Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue


 Conflicts:

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java

	ruoyi-generator/src/main/resources/vm/sql/sql.vm

	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java

	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java

	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

	ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

	ruoyi-ui/src/assets/styles/ruoyi.scss

	ruoyi-ui/src/router/index.js

	ruoyi-ui/src/views/system/menu/index.vue

	ruoyi-ui/src/views/system/role/index.vue

	ruoyi-ui/src/views/system/user/index.vue

	sql/ry_20200920.sql