From 00026c4255ed1b47961d17a5b4500fe788bfa9d8 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 17 九月 2019 09:45:50 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeRecordServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeRecordServiceImpl.java
similarity index 93%
rename from fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java
rename to fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeRecordServiceImpl.java
index 588a874..c096e15 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/integral/IntegralExchangeRecordServiceImpl.java
@@ -1,4 +1,4 @@
-package com.yeshi.fanli.service.impl.integral;
+package com.yeshi.fanli.service.impl.user.integral;
 
 import java.util.Date;
 import java.util.List;
@@ -13,10 +13,10 @@
 import com.yeshi.fanli.entity.integral.IntegralExchange.ExchangeTypeEnum;
 import com.yeshi.fanli.entity.integral.IntegralExchangeRecord;
 import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.inter.integral.CodePublishRecordService;
-import com.yeshi.fanli.service.inter.integral.IntegralExchangeRecordService;
-import com.yeshi.fanli.service.inter.integral.IntegralExchangeService;
 import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
+import com.yeshi.fanli.service.inter.user.integral.CodePublishRecordService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralExchangeRecordService;
+import com.yeshi.fanli.service.inter.user.integral.IntegralExchangeService;
 import com.yeshi.fanli.util.StringUtil;
 
 @Service

--
Gitblit v1.8.0