# WARNING: head commit changed in the meantime
Merge branch 'dev' of
into dev
Conflicts:
src/main/java/com/baomidou/mybatisplus/generator/AutoGenerator.java
@@ -50,6 +50,9 @@ public class ${entity} implements Serializable {
#end
#elseif(${field.convert})
@TableField("${field.name}")
+#end
+#if(${logicDeletePropertyName}==${field.propertyName})
+ @TableLogic
#end
private ${field.propertyType} ${field.propertyName};
#end
