YunaiV 2e58e8585e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into sms_temp_zzf_0127 ...

 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

2021-03-14 18:42:52 +08:00

..

java/cn/iocoder/dashboard

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into sms_temp_zzf_0127

2021-03-14 18:42:52 +08:00

resources

设置 事务 rollback 属性

2021-03-13 23:06:47 +08:00