diff --git a/integration-test/src/test/resources/data-resource.http b/integration-test/src/test/resources/data-resource.http index 39cecbd0..4e4c546c 100644 --- a/integration-test/src/test/resources/data-resource.http +++ b/integration-test/src/test/resources/data-resource.http @@ -27,7 +27,7 @@ Content-Type: application/json "rules": [{"attr": "dataPermission1", "op": "eq", "value": ["1"]},{"attr": "dataPermission2", "op": "eq", "value": ["1"]}]} ] }, - "resourceCode": "workspaceContact1", + "resourceCode": "workspaceContact2", "module": "PROJECT" } diff --git a/tyr-server/pom.xml b/tyr-server/pom.xml index ad45bd91..cdb35da1 100644 --- a/tyr-server/pom.xml +++ b/tyr-server/pom.xml @@ -77,10 +77,6 @@ cn.axzo.basics basics-common - - cn.axzo.framework.data - axzo-data-mybatis-plus - cn.axzo.workflow workflow-engine-api diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/DataResource.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/DataResource.java index 8bbe31f4..f17b22af 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/DataResource.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/DataResource.java @@ -1,6 +1,6 @@ package cn.axzo.tyr.server.repository.entity; -import cn.axzo.framework.data.mybatisplus.model.BaseEntity; +import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; import cn.axzo.tyr.client.common.enums.DataResourceModuleEnum; import cn.axzo.tyr.client.common.enums.DataResourceOperationEnum; import cn.axzo.tyr.client.common.enums.DataResourceTypeEnum; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasFeatureDataResource.java b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasFeatureDataResource.java index 8b031498..2978bd87 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasFeatureDataResource.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/repository/entity/SaasFeatureDataResource.java @@ -1,6 +1,6 @@ package cn.axzo.tyr.server.repository.entity; -import cn.axzo.framework.data.mybatisplus.model.BaseEntity; +import cn.axzo.pokonyan.config.mybatisplus.BaseEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor;