diff --git a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/RealQueryController.java b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/RealQueryController.java index aca51b2..baf2a6f 100644 --- a/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/RealQueryController.java +++ b/hchyun/hchyun-admin/src/main/java/com/hchyun/web/controller/system/RealQueryController.java @@ -4,7 +4,7 @@ import com.hchyun.common.constant.ReturnConstants; import com.hchyun.common.core.controller.BaseController; import com.hchyun.common.core.entity.AjaxResult; import com.hchyun.common.utils.ServerResult; -import com.hchyun.generator.util.MapExcelUtil; +import com.hchyun.common.utils.MapExcelUtil; import com.hchyun.system.entity.RealUniQuery; import com.hchyun.system.service.RealQueryService; import org.slf4j.Logger; diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/MapExcelUtil.java b/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/MapExcelUtil.java similarity index 99% rename from hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/MapExcelUtil.java rename to hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/MapExcelUtil.java index f7ce424..bc1949d 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/util/MapExcelUtil.java +++ b/hchyun/hchyun-common/src/main/java/com/hchyun/common/utils/MapExcelUtil.java @@ -1,4 +1,4 @@ -package com.hchyun.generator.util; +package com.hchyun.common.utils; import com.hchyun.common.config.HchYunConfig; import com.hchyun.common.core.entity.AjaxResult; diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/QueryController.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/QueryController.java index df38fc7..f52e098 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/QueryController.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/controller/QueryController.java @@ -10,7 +10,7 @@ import com.hchyun.common.utils.sql.SqlUtil; import com.hchyun.generator.entity.UniCon; import com.hchyun.generator.entity.UniQuery; import com.hchyun.generator.service.QueryService; -import com.hchyun.generator.util.MapExcelUtil; +import com.hchyun.common.utils.MapExcelUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/impl/QueryServiceImpl.java b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/impl/QueryServiceImpl.java index ab33257..0c91162 100644 --- a/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/impl/QueryServiceImpl.java +++ b/hchyun/hchyun-generator/src/main/java/com/hchyun/generator/service/impl/QueryServiceImpl.java @@ -1,7 +1,6 @@ package com.hchyun.generator.service.impl; import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageHelper; import com.hchyun.common.constant.ReturnConstants; import com.hchyun.common.core.entity.entity.Menu; import com.hchyun.common.utils.SecurityUtils;