From 447ad084d8de1c5ec607a1a10485f63a5a01bb58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=87=91=E6=B5=B7=E6=B4=8B?= <jinhaiyang@axzo.cn>
Date: Mon, 22 Jan 2024 18:08:02 +0800
Subject: [PATCH] modify

---
 integration-test/src/test/resources/data-resource.http        | 2 +-
 tyr-server/pom.xml                                            | 4 ----
 .../cn/axzo/tyr/server/repository/entity/DataResource.java    | 2 +-
 .../tyr/server/repository/entity/SaasFeatureDataResource.java | 2 +-
 4 files changed, 3 insertions(+), 7 deletions(-)

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 @@
             <groupId>cn.axzo.basics</groupId>
             <artifactId>basics-common</artifactId>
         </dependency>
-        <dependency>
-            <groupId>cn.axzo.framework.data</groupId>
-            <artifactId>axzo-data-mybatis-plus</artifactId>
-        </dependency>
         <dependency>
             <groupId>cn.axzo.workflow</groupId>
             <artifactId>workflow-engine-api</artifactId>
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;