From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 16 十二月 2019 15:26:57 +0800
Subject: [PATCH] 冲突信息

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushCouponService.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushCouponService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushCouponService.java
index f6a5641..cfa6c44 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushCouponService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushCouponService.java
@@ -3,8 +3,8 @@
 import java.util.List;
 
 import com.yeshi.fanli.entity.push.PushCoupon;
-import com.yeshi.fanli.exception.PushException;
 import com.yeshi.fanli.exception.push.PushCouponException;
+import com.yeshi.fanli.exception.push.PushException;
 
 public interface PushCouponService {
 

--
Gitblit v1.8.0