From f15acf7f2d57db3a32c574b0dfc21f564dca6024 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 12:01:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushInfoController.java
index 6c9ecf8..f277277 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushInfoController.java
@@ -14,7 +14,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 import com.yeshi.fanli.entity.push.PushInfo;
-import com.yeshi.fanli.exception.PushException;
+import com.yeshi.fanli.exception.push.PushException;
 import com.yeshi.fanli.exception.push.PushInfoException;
 import com.yeshi.fanli.service.inter.push.PushInfoService;
 import com.yeshi.fanli.tag.PageEntity;

--
Gitblit v1.8.0