-
Conflicts: pom.xml src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyDefine.java src/main/java/cn/iocoder/dashboard/framework/redis/core/RedisKeyRegistry.java src/main/java/cn/iocoder/dashboard/framework/security/config/SecurityConfiguration.java src/main/java/cn/iocoder/dashboard/modules/infra/controller/redis/RedisController.java src/main/java/cn/iocoder/dashboard/modules/system/dal/redis/RedisKeyConstants.java src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java
-
Merge pull request !19 from kevinwang0224/ut_infra_logger
-
Merge pull request !15 from niu_dehua/feat_userprofile
-
# Conflicts: # src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserProfileController.java # src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserService.java # src/main/java/cn/iocoder/dashboard/modules/system/service/user/SysUserServiceImpl.java
-
增加 个人信息设置 功能 增加 个人信息设置 功能
-
Merge pull request !14 from timfruit/feature/screw-export-dbdoc
-
# Conflicts: # src/main/resources/application-dev.yaml # src/main/resources/application-local.yaml
-
Merge pull request !18 from 幕羽/feature/muyu
-
2. 修复 h2 脚本的问题
-
Conflicts: pom.xml
修复 Lombok 建造模式，导致构造函数非 public, mapstruct 无法构造实例的问题
添加 lombok-mapstruct-bind，避免高版本的不兼容问题
-
Merge pull request !3 from kevinwang0224/unit_logger_system
-
# Conflicts: # src/test/resources/sql/clean.sql # src/test/resources/sql/create_tables.sql
-
Merge pull request !12 from lianghusile/feature/notice_test