Merge remote-tracking branch 'origin/master'

baomidou · Nov 10, 2017 · 8d05646 · 8d05646
2 parents 23f9f0e + 5b0a14b
commit 8d05646
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/resources/templates/entity.java.vm b/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})

diff --git a/src/main/resources/templates/mapper.java.vm b/src/main/resources/templates/mapper.java.vm
@@ -5,7 +5,7 @@ import ${superMapperClassPackage};
 
 /**
  * <p>
-  * $!{table.comment} Mapper 接口
+ * $!{table.comment} Mapper 接口
  * </p>
  *
  * @author ${author}
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ import ${superMapperClassPackage}; @@
     /**
      * <p>
-      * $!{table.comment} Mapper 接口
+     * $!{table.comment} Mapper 接口
      * </p>
      *
      * @author ${author}
@@ Expand Down @@