From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushInfoService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushInfoService.java
index cdd343c..83b13a4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushInfoService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/push/PushInfoService.java
@@ -3,8 +3,8 @@
 import java.util.List;
 
 import com.yeshi.fanli.entity.push.PushInfo;
-import com.yeshi.fanli.exception.PushException;
 import com.yeshi.fanli.exception.push.PushCouponException;
+import com.yeshi.fanli.exception.push.PushException;
 import com.yeshi.fanli.exception.push.PushInfoException;
 
 public interface PushInfoService {

--
Gitblit v1.8.0