diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerConfigurer.java b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerConfigurer.java
index 07a3613ced8dda24b36893d5cfc4915e9326b5bc..7283b643861171555f54dfe4e0769c02fc1d3021 100644
--- a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerConfigurer.java
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerConfigurer.java
@@ -50,6 +50,8 @@ public class StreamScannerConfigurer implements BeanFactoryPostProcessor {
   private Class<? extends Annotation> annotation;
   /** scan interface */
   private Class<?> interfaceClass;
+  /** if basePackages is empty. */
+  private boolean emptyBasePackages;
 
   public void setBasePackages(Set<String> basePackages) {
     this.basePackages = basePackages;
@@ -66,6 +68,10 @@ public class StreamScannerConfigurer implements BeanFactoryPostProcessor {
   public void setInterfaceClass(Class<?> interfaceClass) {
     this.interfaceClass = interfaceClass;
   }
+  
+  public void setEmptyBasePackages(boolean emptyBasePackages) {
+    this.emptyBasePackages = emptyBasePackages;
+  }
 
   private void registerEntityClasses(Collection<Class<?>> entityClasses) {
     if (!CollectionUtils.isEmpty(entityClasses)) {
@@ -93,12 +99,8 @@ public class StreamScannerConfigurer implements BeanFactoryPostProcessor {
 
   private void defaultScanConfig() {
     // default scan @TableName
-    if (CollectionUtils.isEmpty(basePackages) && annotation == null && interfaceClass == null) {
+    if (emptyBasePackages && annotation == null && interfaceClass == null) {
       annotation = TableName.class;
     }
-    // if no base package specified, scan project package
-    if (CollectionUtils.isEmpty(basePackages)) {
-      basePackages.add("");
-    }
   }
 }
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerRegistrar.java b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerRegistrar.java
index 4389ad7593527569f26f2839f060b92df233a1f0..484a2bbadacad48ddd475f4e9dbc933cb452ecab 100644
--- a/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerRegistrar.java
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/main/java/org/dromara/streamquery/stream/plugin/mybatisplus/engine/configuration/StreamScannerRegistrar.java
@@ -66,6 +66,10 @@ public class StreamScannerRegistrar implements ImportBeanDefinitionRegistrar {
             .filter(Objects::nonNull)
             .map(ClassUtils::getPackageName)
             .collect(Collectors.toSet()));
+    if (basePackages.isEmpty()) {
+      basePackages.add(ClassUtils.getPackageName(importingClassMetadata.getClassName()));
+      builder.addPropertyValue("emptyBasePackages", true);
+    }
     builder.addPropertyValue("basePackages", basePackages);
 
     Set<Class<?>> classes =
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationAndInterfaceClassTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationAndInterfaceClassTest.java
index 7be3aa324ef5926bbb5a1baeb4cd2b10487c2824..a36e656e93b5cf6edd6d4c050fe811115fe76d29 100644
--- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationAndInterfaceClassTest.java
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationAndInterfaceClassTest.java
@@ -16,14 +16,14 @@
  */
 package org.dromara.streamquery.stream.plugin.mybatisplus.annotation;
 
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.GenerateMapper;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.mapper.IGenerateMapper;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 
@@ -38,7 +38,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  */
 @EnableAutoConfiguration
 @EnableMybatisPlusPlugin(
-    basePackages = "org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po",
+    basePackages = "org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po",
     annotation = GenerateMapper.class,
     interfaceClass = IGenerateMapper.class)
 public class EnableMybatisPlusPluginByAnnotationAndInterfaceClassTest
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationTest.java
index 8c2dfad733743da5acfd8903bc50e3e6e6be1573..bb1dcb748c69634dbc1679e646560f9acff50126 100644
--- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationTest.java
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByAnnotationTest.java
@@ -16,13 +16,13 @@
  */
 package org.dromara.streamquery.stream.plugin.mybatisplus.annotation;
 
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.GenerateMapper;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackageClassesTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackageClassesTest.java
index e3561bea2b98bf3ee12a87bfcd811dbae5a5c856..93104f028bd840f105e461fb201fdc65d75b397c 100644
--- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackageClassesTest.java
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackageClassesTest.java
@@ -16,12 +16,12 @@
  */
 package org.dromara.streamquery.stream.plugin.mybatisplus.annotation;
 
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesGeneralTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesGeneralTest.java
index b12cf6a6c774a2162efe14e4f5536e7097721374..5600c7f779fd61a2ccd8e847324052a8c5196115 100644
--- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesGeneralTest.java
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesGeneralTest.java
@@ -16,12 +16,12 @@
  */
 package org.dromara.streamquery.stream.plugin.mybatisplus.annotation;
 
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  * @author <a href = "kamtohung@gmail.com">KamTo Hung</a>
  */
 @EnableAutoConfiguration
-@EnableMybatisPlusPlugin(basePackages = "org.dromara.streamquery.stream.plugin.*.pojo.po")
+@EnableMybatisPlusPlugin(basePackages = "org.dromara.streamquery.stream.plugin.mybatisplus.*.pojo.po")
 public class EnableMybatisPlusPluginByBasePackagesGeneralTest
     extends AbstractMybatisPlusTestApplication {
 
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesTest.java
index 665d5a583f4195b59687adeb431c657b2de34b7b..a983db9262c6734393f9474eb1d7a2c39fc2fa90 100644
--- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesTest.java
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByBasePackagesTest.java
@@ -16,12 +16,12 @@
  */
 package org.dromara.streamquery.stream.plugin.mybatisplus.annotation;
 
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  * @author <a href = "kamtohung@gmail.com">KamTo Hung</a>
  */
 @EnableAutoConfiguration
-@EnableMybatisPlusPlugin(basePackages = "org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po")
+@EnableMybatisPlusPlugin(basePackages = "org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po")
 public class EnableMybatisPlusPluginByBasePackagesTest extends AbstractMybatisPlusTestApplication {
 
   @Test
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByClassesTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByClassesTest.java
index 80710f52d0d6f11acb01830530a689155736a8a3..574164ed4ef4ab036fa386693819a60e30bd2c90 100644
--- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByClassesTest.java
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByClassesTest.java
@@ -16,12 +16,12 @@
  */
 package org.dromara.streamquery.stream.plugin.mybatisplus.annotation;
 
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByInterfaceClassTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByInterfaceClassTest.java
index 9280a542aff86ff41c922cce694e19d0545ecbee..9effb341389cdadb754001bc95b08594ab71100e 100644
--- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByInterfaceClassTest.java
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByInterfaceClassTest.java
@@ -16,13 +16,13 @@
  */
 package org.dromara.streamquery.stream.plugin.mybatisplus.annotation;
 
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.mapper.IGenerateMapper;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 
@@ -37,7 +37,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  */
 @EnableAutoConfiguration
 @EnableMybatisPlusPlugin(
-    basePackages = "org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po",
+    basePackages = "org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po",
     interfaceClass = IGenerateMapper.class)
 public class EnableMybatisPlusPluginByInterfaceClassTest
     extends AbstractMybatisPlusTestApplication {
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByValueTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByValueTest.java
index 56dbc048111f1879835ab21535a18ba02ab7f814..ba3f51d964ff43c5b2eabeb0208e16a4dd8961d4 100644
--- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByValueTest.java
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginByValueTest.java
@@ -16,12 +16,12 @@
  */
 package org.dromara.streamquery.stream.plugin.mybatisplus.annotation;
 
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
  * @author <a href = "kamtohung@gmail.com">KamTo Hung</a>
  */
 @EnableAutoConfiguration
-@EnableMybatisPlusPlugin("org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po")
+@EnableMybatisPlusPlugin("org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po")
 public class EnableMybatisPlusPluginByValueTest extends AbstractMybatisPlusTestApplication {
 
   @Test
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginTest.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginTest.java
index 6a46ed11ecd5bbe973425de4735d11607974239a..9a23dc5e85e57613690dd13171e4a6f1acba2d2b 100644
--- a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginTest.java
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/EnableMybatisPlusPluginTest.java
@@ -16,12 +16,12 @@
  */
 package org.dromara.streamquery.stream.plugin.mybatisplus.annotation;
 
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.RoleInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserInfo;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.UserRole;
+import org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner.AddressInfo;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.EnableMybatisPlusPlugin;
 import org.dromara.streamquery.stream.plugin.mybatisplus.engine.configuration.StreamScannerConfigurer;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.RoleInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserInfo;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.UserRole;
-import org.dromara.streamquery.stream.plugin.mybatisplus.pojo.po.inner.AddressInfo;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/RoleInfo.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/RoleInfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..94ec3168c9cc9a71e0bcf4886b26bb7cc9648b0e
--- /dev/null
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/RoleInfo.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po;
+
+import lombok.Data;
+import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.GenerateMapper;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * RoleInfo
+ *
+ * @author VampireAchao Cizai_
+ * @since 2022/5/23
+ */
+@Data
+@GenerateMapper
+@TableName("role_info")
+@KeySequence(dbType = DbType.H2)
+public class RoleInfo {
+
+  @TableId(type = IdType.ASSIGN_ID)
+  private String id;
+
+  private String roleName;
+}
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/UserInfo.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/UserInfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..e4e9e2afce096bcef951d443bdd6e8993ca0ac9f
--- /dev/null
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/UserInfo.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po;
+
+import java.time.LocalDateTime;
+
+import lombok.Data;
+import org.dromara.streamquery.stream.plugin.mybatisplus.engine.mapper.IGenerateMapper;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * UserInfo
+ *
+ * @author VampireAchao Cizai_
+ * @since 2022/5/21
+ */
+@Data
+@TableName("user_info")
+public class UserInfo implements IGenerateMapper {
+
+  private static final long serialVersionUID = -7219188882388819210L;
+
+  @TableId(value = "id", type = IdType.AUTO)
+  private Long id;
+
+  private String name;
+  private Integer age;
+  private String email;
+  //  @Version private Integer version;
+
+  @TableLogic(value = "'2001-01-01 00:00:00'", delval = "NOW()")
+  private LocalDateTime gmtDeleted;
+}
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/UserRole.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/UserRole.java
new file mode 100644
index 0000000000000000000000000000000000000000..7a68d9320f70c115bf9e70a204f86cdd474cf857
--- /dev/null
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/UserRole.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po;
+
+import lombok.Data;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * UserRole
+ *
+ * @author VampireAchao Cizai_
+ * @since 2022/5/23
+ */
+@Data
+@TableName("user_role")
+public class UserRole {
+
+  private Long id;
+  private Long userId;
+  private String roleId;
+}
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/inner/AddressInfo.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/inner/AddressInfo.java
new file mode 100644
index 0000000000000000000000000000000000000000..be30e10985e7421210501af720ebf2257f1f5e26
--- /dev/null
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/inner/AddressInfo.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po.inner;
+
+import lombok.Data;
+import org.dromara.streamquery.stream.plugin.mybatisplus.engine.annotation.GenerateMapper;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+/**
+ * AddressInfo
+ *
+ * @author KamToHung
+ */
+@Data
+@GenerateMapper
+public class AddressInfo {
+
+  @TableId(type = IdType.ASSIGN_ID)
+  private String id;
+
+  private String address;
+
+  @Data
+  public static class InnerAddressInfo {
+    private String id;
+  }
+}
diff --git a/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/package-info.java b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..28f792f940f1bd85ce6b18c0ed23187710377242
--- /dev/null
+++ b/stream-plugin/stream-plugin-mybatis-plus/src/test/java/org/dromara/streamquery/stream/plugin/mybatisplus/annotation/pojo/po/package-info.java
@@ -0,0 +1,17 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.streamquery.stream.plugin.mybatisplus.annotation.pojo.po;