From 075f6eceec6908178ba53b40b7794e2f90f74c92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:40:10 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java b/fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java
index e949a35..36f58bf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/RedisManager.java
@@ -39,7 +39,7 @@
 	private TaoBaoShopService taoBaoShopService;
 
 	@Resource
-	private TaoBaoUnionConfigService taoBaoUnionConfigService;
+	private TaoBaoUnionConfigService taoBaoUnionConfigService;
 
 	@Resource
 	private ConfigService configService;

--
Gitblit v1.8.0