Conflicts: ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/properties/IgnoreWhiteProperties.java ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java |
||
|---|---|---|
| .. | ||
| ruoyi-common-core | ||
| ruoyi-common-datascope | ||
| ruoyi-common-datasource | ||
| ruoyi-common-log | ||
| ruoyi-common-redis | ||
| ruoyi-common-security | ||
| ruoyi-common-swagger | ||
| pom.xml | ||