Merge remote-tracking branch 'origin/master'

src/main/resources/templates/entity.java.vm

@@ -25,6 +25,7 @@ import lombok.experimental.Accessors;
  */
 #if(${entityLombokModel})
 @Data
+@EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 #end
 #if(${table.convert})

src/main/resources/templates/mapper.java.vm

@@ -5,7 +5,7 @@ import ${superMapperClassPackage};
 
 /**
  * <p>
-  * $!{table.comment} Mapper 接口
+ * $!{table.comment} Mapper 接口
  * </p>
  *
  * @author ${author}