Merge branch 'dev' into 'master'

test Closes #8 See merge request mall/arch/matrix!5

Merge branch 'dev' into 'master'
test Closes #8 See merge request mall/arch/matrix!5
8ec9390c · 李秋伟 · cba01508 · 5af7e57a · 8ec9390c · 8ec9390c
Commit 8ec9390c authored Aug 12, 2019 by 李秋伟
2 changed files
--- a/common-core/src/main/java/com/secoo/mall/common/core/aop/AopTransaction.java
+++ b/common-core/src/main/java/com/secoo/mall/common/core/aop/AopTransaction.java
@@ -29,7 +29,6 @@ public class AopTransaction {
    public void createPointCut() {
    }

-
    /**
     * 更新切入点
     */

--- a/redis-starter/src/main/java/com/secoo/mall/redis/config/MatrixeRedisAutoConfiguration.java
+++ b/redis-starter/src/main/java/com/secoo/mall/redis/config/MatrixeRedisAutoConfiguration.java