From a4ead537efd13961de97a2466249a62d17b8c2ad Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期三, 19 六月 2019 16:59:04 +0800
Subject: [PATCH] Merge branch 'shiyj01'

---
 java110-core/src/main/java/com/java110/core/base/controller/BaseController.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java b/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java
index 8566919..4ead590 100644
--- a/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java
+++ b/java110-core/src/main/java/com/java110/core/base/controller/BaseController.java
@@ -1,17 +1,15 @@
 package com.java110.core.base.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.java110.common.constant.CommonConstant;
 import com.java110.common.constant.ResponseConstant;
-import com.java110.common.exception.InitDataFlowContextException;
 import com.java110.common.exception.NoAuthorityException;
 
 import com.java110.common.util.StringUtil;
 import com.java110.core.base.AppBase;
 import com.java110.core.context.BusinessServiceDataFlow;
 import com.java110.core.factory.DataFlowFactory;
-import com.java110.entity.service.PageData;
+import com.java110.core.context.PageData;
 import org.springframework.ui.Model;
 
 import javax.servlet.http.HttpServletRequest;

--
Gitblit v1.8.0