Merge remote-tracking branch 'origin/3.0' into 3.0

mybatis-plus-annotation/src/main/java/com/baomidou/mybatisplus/annotation/EnumValue.java

@@ -28,6 +28,23 @@ import java.lang.annotation.Target;
  * </p>
  * <p>
  * 使用方式参考 com.baomidou.mybatisplus.test.h2.H2StudentMapperTest
+ *
+ * &#64;TableName("student")
+ * class Student {
+ *     private Integer id;
+ *     private String name;
+ *     private GradeEnum grade;//数据库grade字段类型为int
+ * }
+ *
+ * public enum GradeEnum {
+ *     PRIMARY(1,"小学"),
+ *     SECONDORY("2", "中学"),
+ *     HIGH(3, "高中");
+ *
+ *     &#64;EnumValue
+ *     private final int code;
+ *     private final String descp;
+ * }
  * </p>
  *
  * @author yuxiaobin

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

@@ -59,6 +59,10 @@ public class TableField {
     }
 
     protected void setConvert(StrategyConfig strategyConfig) {
+        if (strategyConfig.isEntityTableFieldAnnotationEnable()) {
+            this.convert = true;
+            return;
+        }
         if (strategyConfig.isCapitalModeNaming(name)) {
             this.convert = false;
         } else {