全局配置方法过时.

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/GlobalConfig.java

@@ -310,6 +310,79 @@ public class GlobalConfig {
         return this;
     }
 
+    /**
+     * @param outputDir
+     * @return this
+     * @see Builder#outputDir(String)
+     * @deprecated 3.4.1
+     */
+    @Deprecated
+    public GlobalConfig setOutputDir(String outputDir) {
+        this.outputDir = outputDir;
+        return this;
+    }
+
+    /**
+     * @param fileOverride
+     * @return this
+     * @see Builder#fileOverride(boolean)
+     * @deprecated 3.4.1
+     */
+    @Deprecated
+    public GlobalConfig setFileOverride(boolean fileOverride) {
+        this.fileOverride = fileOverride;
+        return this;
+    }
+
+    /**
+     * @param open
+     * @return this
+     * @see Builder#openDir(boolean)
+     * @deprecated 3.4.1
+     */
+    @Deprecated
+    public GlobalConfig setOpen(boolean open) {
+        this.open = open;
+        return this;
+    }
+
+    /**
+     * @param author
+     * @return this
+     * @see Builder#author(String)
+     * @deprecated 3.4.1
+     */
+    @Deprecated
+    public GlobalConfig setAuthor(String author) {
+        this.author = author;
+        return this;
+    }
+
+    /**
+     * @param kotlin
+     * @return this
+     * @see Builder#kotlin(boolean)
+     * @deprecated 3.4.1
+     */
+    @Deprecated
+    public GlobalConfig setKotlin(boolean kotlin) {
+        this.kotlin = kotlin;
+        return this;
+    }
+
+    /**
+     * @param swagger2
+     * @return this
+     * @see Builder#swagger2(boolean)
+     * @deprecated 3.4.1
+     */
+    @Deprecated
+    public GlobalConfig setSwagger2(boolean swagger2) {
+        this.swagger2 = swagger2;
+        return this;
+    }
+
+
     /**
      * 全局配置构建
      *

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/po/TableInfo.java

@@ -20,6 +20,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -255,7 +256,7 @@ public class TableInfo {
             importSerializable = false;
             this.importPackages.add(strategyConfig.entity().getSuperClass());
         } else {
-            if (globalConfig.isActiveRecord()) {
+            if (globalConfig.isActiveRecord() || strategyConfig.entity().isActiveRecord()) {
                 // 无父类开启 AR 模式
                 this.importPackages.add(Model.class.getCanonicalName());
                 importSerializable = false;
@@ -270,7 +271,8 @@ public class TableInfo {
         if (strategyConfig.entity().getLogicDeleteFieldName() != null && this.isLogicDelete(strategyConfig.entity().getLogicDeleteFieldName())) {
             this.importPackages.add(TableLogic.class.getCanonicalName());
         }
-        if (null != globalConfig.getIdType() && this.isHavePrimaryKey()) {
+        IdType idType = Optional.ofNullable(strategyConfig.entity().getIdType()).orElseGet(globalConfig::getIdType);
+        if (null != idType && this.isHavePrimaryKey()) {
             // 指定需要 IdType 场景
             this.importPackages.add(IdType.class.getCanonicalName());
             this.importPackages.add(TableId.class.getCanonicalName());