fix: #IM3XE @gitee 配置开启注解，TableName也强制生成

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

@@ -15,18 +15,19 @@
  */
 package com.baomidou.mybatisplus.generator.config.po;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.IntStream;
+
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.generator.config.StrategyConfig;
 import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+
 import lombok.Data;
 import lombok.experimental.Accessors;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.IntStream;
-
 /**
  * 表信息，关联到当前字段信息
  *
@@ -60,7 +61,7 @@ public class TableInfo {
     }
 
     protected TableInfo setConvert(StrategyConfig strategyConfig) {
-        if (strategyConfig.containsTablePrefix(name)) {
+        if (strategyConfig.containsTablePrefix(name) || strategyConfig.isEntityTableFieldAnnotationEnable()) {
             // 包含前缀
             this.convert = true;
         } else if (strategyConfig.isCapitalModeNaming(name)) {

mybatis-plus-generator/src/main/resources/templates/entity.java.vm

@@ -23,11 +23,11 @@ import lombok.experimental.Accessors;
  */
 #if(${entityLombokModel})
 @Data
-#if(${superEntityClass})
+  #if(${superEntityClass})
 @EqualsAndHashCode(callSuper = true)
-#else
+  #else
 @EqualsAndHashCode(callSuper = false)
-#end
+  #end
 @Accessors(chain = true)
 #end
 #if(${table.convert})
@@ -54,31 +54,31 @@ public class ${entity} implements Serializable {
 #set($keyPropertyName=${field.propertyName})
 #end
 #if("$!field.comment" != "")
-#if(${swagger2})
+  #if(${swagger2})
     @ApiModelProperty(value = "${field.comment}")
-#else
+  #else
     /**
      * ${field.comment}
      */
-#end
+  #end
 #end
 #if(${field.keyFlag})
 ## 主键
-#if(${field.keyIdentityFlag})
+  #if(${field.keyIdentityFlag})
     @TableId(value = "${field.name}", type = IdType.AUTO)
-#elseif(!$null.isNull(${idType}) && "$!idType" != "")
+  #elseif(!$null.isNull(${idType}) && "$!idType" != "")
     @TableId(value = "${field.name}", type = IdType.${idType})
-#elseif(${field.convert})
+  #elseif(${field.convert})
     @TableId("${field.name}")
-#end
+  #end
 ## 普通字段
 #elseif(${field.fill})
 ## -----   存在字段填充设置   -----
-#if(${field.convert})
+  #if(${field.convert})
     @TableField(value = "${field.name}", fill = FieldFill.${field.fill})
-#else
+  #else
     @TableField(fill = FieldFill.${field.fill})
-#end
+  #end
 #elseif(${field.convert})
     @TableField("${field.name}")
 #end
@@ -96,43 +96,45 @@ public class ${entity} implements Serializable {
 
 #if(!${entityLombokModel})
 #foreach($field in ${table.fields})
-#if(${field.propertyType.equals("boolean")})
-#set($getprefix="is")
-#else
-#set($getprefix="get")
-#end
+  #if(${field.propertyType.equals("boolean")})
+    #set($getprefix="is")
+  #else
+    #set($getprefix="get")
+  #end
 
     public ${field.propertyType} ${getprefix}${field.capitalName}() {
         return ${field.propertyName};
     }
 
-#if(${entityBuilderModel})
+  #if(${entityBuilderModel})
     public ${entity} set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
-#else
+  #else
     public void set${field.capitalName}(${field.propertyType} ${field.propertyName}) {
-#end
+  #end
         this.${field.propertyName} = ${field.propertyName};
-#if(${entityBuilderModel})
+  #if(${entityBuilderModel})
         return this;
-#end
+  #end
     }
 #end
+## --foreach end---
 #end
+## --end of #if(!${entityLombokModel})--
 
 #if(${entityColumnConstant})
-#foreach($field in ${table.fields})
+  #foreach($field in ${table.fields})
     public static final String ${field.name.toUpperCase()} = "${field.name}";
 
-#end
+  #end
 #end
 #if(${activeRecord})
     @Override
     protected Serializable pkVal() {
-#if(${keyPropertyName})
+  #if(${keyPropertyName})
         return this.${keyPropertyName};
-#else
+  #else
         return null;
-#end
+  #end
     }
 
 #end
@@ -140,13 +142,13 @@ public class ${entity} implements Serializable {
     @Override
     public String toString() {
         return "${entity}{" +
-#foreach($field in ${table.fields})
-#if($!{foreach.index}==0)
+  #foreach($field in ${table.fields})
+    #if($!{foreach.index}==0)
         "${field.propertyName}=" + ${field.propertyName} +
-#else
+    #else
         ", ${field.propertyName}=" + ${field.propertyName} +
-#end
-#end
+    #end
+  #end
         "}";
     }
 #end