WIP: 合并申请时冲突合并处理测试11 #2

Closed
chenzihao wants to merge 1 commits from sac_ca_router_merge_test_1 into sac_ca_router_merge_test
Showing only changes of commit 5b72ebf796 - Show all commits

View File

@ -10,7 +10,7 @@ import org.springframework.data.redis.core.script.DefaultRedisScript;
import org.springframework.data.redis.serializer.StringRedisSerializer;
/**
* redis配置 hhhh
* redis配置 hhhh2222
*
* @author ztzh
*/