• # Conflicts:
    #	yudao-dependencies/pom.xml
    #	yudao-framework/yudao-spring-boot-starter-web/pom.xml
    #	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/config/YudaoSwaggerAutoConfiguration.java
    #	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/swagger/core/SpringFoxHandlerProviderBeanPostProcessor.java
    #	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
    xingyu authored
     
    Browse File »
  • xingyu authored
     
    Browse File »




















  •  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
    YunaiV authored
     
    Browse Dir »