疯狂的狮子li d3abd6c96e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev ...

 Conflicts:

	ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java

	ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java

	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java

	ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java

	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java

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

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

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

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

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

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

	ruoyi-ui/src/components/Breadcrumb/index.vue

2021-08-17 10:38:07 +08:00

..

src/main

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

2021-08-17 10:38:07 +08:00

pom.xml

update 移动文件存储业务到 system 模块

2021-08-04 17:26:14 +08:00