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