Commit 8ec9390c by 李秋伟

Merge branch 'dev' into 'master'

test

Closes #8

See merge request mall/arch/matrix!5
parents cba01508 5af7e57a
...@@ -29,7 +29,6 @@ public class AopTransaction { ...@@ -29,7 +29,6 @@ public class AopTransaction {
public void createPointCut() { public void createPointCut() {
} }
/** /**
* 更新切入点 * 更新切入点
*/ */
......
...@@ -29,7 +29,7 @@ public class MatrixeRedisAutoConfiguration { ...@@ -29,7 +29,7 @@ public class MatrixeRedisAutoConfiguration {
redisTemplate.setHashValueSerializer(stringSerializer); redisTemplate.setHashValueSerializer(stringSerializer);
return redisTemplate; return redisTemplate;
} }
@Bean @Bean
@ConditionalOnMissingBean(MatrixRedisClusterUtils.class) @ConditionalOnMissingBean(MatrixRedisClusterUtils.class)
public MatrixRedisClusterUtils jedisClusterUtils() { public MatrixRedisClusterUtils jedisClusterUtils() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment