diff --git a/src/com/engine/salary/common/Page.java b/src/com/engine/salary/component/Page.java similarity index 94% rename from src/com/engine/salary/common/Page.java rename to src/com/engine/salary/component/Page.java index 726165bbb..a23215bfb 100644 --- a/src/com/engine/salary/common/Page.java +++ b/src/com/engine/salary/component/Page.java @@ -1,4 +1,4 @@ -package com.engine.salary.common; +package com.engine.salary.component; import java.util.ArrayList; @@ -147,8 +147,8 @@ public class Page extends ArrayList { * * @return */ - public com.engine.salary.common.PageInfo toPageInfo() { - com.engine.salary.common.PageInfo pageInfo = new com.engine.salary.common.PageInfo(this); + public PageInfo toPageInfo() { + PageInfo pageInfo = new PageInfo(this); return pageInfo; } diff --git a/src/com/engine/salary/common/PageInfo.java b/src/com/engine/salary/component/PageInfo.java similarity index 99% rename from src/com/engine/salary/common/PageInfo.java rename to src/com/engine/salary/component/PageInfo.java index 6042f3e29..6a630a6e4 100644 --- a/src/com/engine/salary/common/PageInfo.java +++ b/src/com/engine/salary/component/PageInfo.java @@ -1,4 +1,4 @@ -package com.engine.salary.common; +package com.engine.salary.component; import java.io.Serializable; diff --git a/src/com/engine/salary/component/PageInterceptor.java b/src/com/engine/salary/component/PageInterceptor.java index 41a7aaa9c..a41d739dd 100644 --- a/src/com/engine/salary/component/PageInterceptor.java +++ b/src/com/engine/salary/component/PageInterceptor.java @@ -1,7 +1,6 @@ package com.engine.salary.component; -import com.engine.salary.common.Page; import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.binding.MapperMethod; import org.apache.ibatis.executor.parameter.ParameterHandler; diff --git a/src/com/engine/salary/util/page/PageInfo.java b/src/com/engine/salary/util/page/PageInfo.java index e2c82da5a..da8313a78 100644 --- a/src/com/engine/salary/util/page/PageInfo.java +++ b/src/com/engine/salary/util/page/PageInfo.java @@ -10,7 +10,7 @@ import java.util.List; @Data @ToString -public class PageInfo extends com.engine.salary.common.PageInfo { +public class PageInfo extends com.engine.salary.component.PageInfo { Class clazz; public void setColumns(List columns) {