-
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 !15 from niu_dehua/feat_userprofile
-
增加 个人信息设置 功能 增加 个人信息设置 功能
-
Merge pull request !14 from timfruit/feature/screw-export-dbdoc
-
# Conflicts: # src/main/resources/application-dev.yaml # src/main/resources/application-local.yaml
-
2. 修复 h2 脚本的问题
-
# Conflicts: # src/test/resources/sql/create_tables.sql
-
2. 修改 readme 3. 优化 config 模块的排版
-
SysUserSessionDO.java 表结构新增字段 username; create_tables.sql 修改 ruoyi-vue-pro.sql 修改 移除超时的在线用户-
-
Merge pull request !9 from 贺小五/feature/creator_updater
-
# Conflicts: # sql/ruoyi-vue-pro.sql
-
BaseDO新增TableField注解,用于自动填充参数
-
将 DefaultParamHandler 改名为 DefaultDBFieldHandler
-
Merge pull request !7 from dxyx/master