diff --git a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/ResourceGatewayImpl.java b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/ResourceGatewayImpl.java index d4aa8c0930..332ebbecd8 100644 --- a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/ResourceGatewayImpl.java +++ b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/ResourceGatewayImpl.java @@ -35,7 +35,7 @@ import org.laokou.admin.dto.resource.clientobject.StartCO; import org.laokou.admin.gatewayimpl.database.ResourceAuditMapper; import org.laokou.admin.gatewayimpl.database.ResourceMapper; -import org.laokou.admin.gatewayimpl.database.dataindex.ResourceIndex; +import org.laokou.admin.gatewayimpl.database.dataobject.ResourceIndex; import org.laokou.admin.gatewayimpl.database.dataobject.ResourceAuditDO; import org.laokou.admin.gatewayimpl.database.dataobject.ResourceDO; import org.laokou.admin.gatewayimpl.rpc.TasksFeignClient; diff --git a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/database/ResourceMapper.java b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/database/ResourceMapper.java index 1b66cc4317..6d9948f456 100644 --- a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/database/ResourceMapper.java +++ b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/database/ResourceMapper.java @@ -21,7 +21,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.session.ResultHandler; -import org.laokou.admin.gatewayimpl.database.dataindex.ResourceIndex; +import org.laokou.admin.gatewayimpl.database.dataobject.ResourceIndex; import org.laokou.admin.gatewayimpl.database.dataobject.ResourceDO; import org.laokou.common.i18n.dto.PageQuery; import org.laokou.common.mybatisplus.database.BatchMapper; diff --git a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/database/dataindex/ResourceIndex.java b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/database/dataobject/ResourceIndex.java similarity index 96% rename from laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/database/dataindex/ResourceIndex.java rename to laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/database/dataobject/ResourceIndex.java index 8bdc64ef39..7ff9e0e122 100644 --- a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/database/dataindex/ResourceIndex.java +++ b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/database/dataobject/ResourceIndex.java @@ -15,7 +15,7 @@ * */ -package org.laokou.admin.gatewayimpl.database.dataindex; +package org.laokou.admin.gatewayimpl.database.dataobject; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; diff --git a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/resources/mapper/resource/ResourceMapper.xml b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/resources/mapper/resource/ResourceMapper.xml index 4c3d1b3b55..555b696e59 100644 --- a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/resources/mapper/resource/ResourceMapper.xml +++ b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/resources/mapper/resource/ResourceMapper.xml @@ -47,7 +47,7 @@ order by id desc - select id , title , code