diff --git a/src/test/resources/template/mapper.vm b/src/test/resources/template/mapper.vm
index 7bd0b6d..2060c37 100644
--- a/src/test/resources/template/mapper.vm
+++ b/src/test/resources/template/mapper.vm
@@ -32,13 +32,16 @@ import java.util.List;
 @Mapper
 #end
 public interface ${ClassName} {
+
     /**
      * 新增/修改$!{tbl.comment}
      *
      * @param bean 主键为空-新增实体、主键非空-更新条件
      * @return 影响记录数
      */
-    Integer update(@Param("bean") ${QueryName} bean);
+    Integer update(
+        @Param("bean") ${QueryName} bean
+    );
 
     /**
      * 批量新增/修改$!{tbl.comment}
@@ -46,25 +49,19 @@ public interface ${ClassName} {
      * @param list 主键为空-新增实体、主键非空-更新条件
      * @return 影响记录数
      */
-    Integer updateBatch(@Param("list") List<${QueryName}> list);
-
-#if(${pkColumn})
-    /**
-     * 通过主键物理删除$!{tbl.comment}
-     *
-     * @param ${pkColumn.fieldName} 主键
-     * @return 影响记录数
-     */
-    Integer deleteByPK(@Param("pk") ${pkColumn.javaType} ${pkColumn.fieldName});
+    Integer updateBatch(
+        @Param("list") List<${QueryName}> list
+    );
 
-#end
     /**
      * 物理删除$!{tbl.comment}
      *
      * @param bean 删除条件
      * @return 影响记录数
      */
-    Integer delete(@Param("bean") ${QueryName} bean);
+    Integer delete(
+        @Param("bean") ${QueryName} bean
+    );
 
 #if(${invalidColumnExists})
     /**
@@ -73,7 +70,9 @@ public interface ${ClassName} {
      * @param bean 删除条件
      * @return 影响记录数
      */
-    Integer invalid(@Param("bean") ${QueryName} bean);
+    Integer invalid(
+        @Param("bean") ${QueryName} bean
+    );
 
 #end
     /**
@@ -82,7 +81,9 @@ public interface ${ClassName} {
      * @param bean 查询条件
      * @return 单个
      */
-    ${EntityName} anyOne(@Param("bean") ${QueryName} bean);
+    ${EntityName} anyOne(
+        @Param("bean") ${QueryName} bean
+    );
 
     /**
      * 查询单个$!{tbl.comment} 明确知道结果必存在一个
@@ -90,25 +91,19 @@ public interface ${ClassName} {
      * @param bean 查询条件
      * @return 单个
      */
-    ${EntityName} onlyOne(@Param("bean") ${QueryName} bean);
-
-#if(${pkColumn})
-    /**
-     * 通过主键物理查询单个$!{tbl.comment}
-     *
-     * @param ${pkColumn.fieldName} 主键
-     * @return 单个
-     */
-    ${EntityName} oneByPK(@Param("pk") ${pkColumn.javaType} ${pkColumn.fieldName});
+    ${EntityName} onlyOne(
+        @Param("bean") ${QueryName} bean
+    );
 
-#end
     /**
      * 查询多个$!{tbl.comment}
      *
      * @param bean 查询条件
      * @return 列表
      */
-    List<${EntityName}> list(@Param("bean") ${QueryName} bean);
+    List<${EntityName}> list(
+        @Param("bean") ${QueryName} bean
+    );
 
     /**
      * 统计符合条件的$!{tbl.comment}实体个数
@@ -116,6 +111,63 @@ public interface ${ClassName} {
      * @param bean 查询条件
      * @return 统计结果
      */
-    Long count(@Param("bean") ${QueryName} bean);
+    Long count(
+        @Param("bean") ${QueryName} bean
+    );
+
+#foreach($indexColumns in ${tbl.indexes})
+#set(${methodNameWithSuffix}="oneBy#foreach($indexColumn in ${indexColumns})${indexColumn.fieldNameCap}And#end")
+#set(${methodName}="$methodNameWithSuffix.substring(0, $methodNameWithSuffix.length() - 3)")
+#set(${paramNamesWithSuffix}="#foreach($indexColumn in ${indexColumns})@Param(""${indexColumn.fieldName}"") ${indexColumn.javaType} ${indexColumn.fieldName}, #end")
+#set(${paramNames}="$paramNamesWithSuffix.substring(0, $paramNamesWithSuffix.length() - 2)")
+#set(${paramComments}="#foreach($indexColumn in ${indexColumns})
+
+     * @param ${indexColumn.fieldName} ${indexColumn.comment}#end")
+    /**
+     * 通过唯一键查询单个$!{tbl.comment}
+     * ${paramComments}
+     * @return 单个$!{tbl.comment}
+     */
+    ${EntityName} $methodName(
+        ${paramNames}
+    );
+
+#end
+#foreach($indexColumns in ${tbl.indexes})
+#set(${methodNameWithSuffix}="deleteBy#foreach($indexColumn in ${indexColumns})${indexColumn.fieldNameCap}And#end")
+#set(${methodName}="$methodNameWithSuffix.substring(0, $methodNameWithSuffix.length() - 3)")
+#set(${paramNamesWithSuffix}="#foreach($indexColumn in ${indexColumns})@Param(""${indexColumn.fieldName}"") ${indexColumn.javaType} ${indexColumn.fieldName}, #end")
+#set(${paramNames}="$paramNamesWithSuffix.substring(0, $paramNamesWithSuffix.length() - 2)")
+#set(${paramComments}="#foreach($indexColumn in ${indexColumns})
+
+     * @param ${indexColumn.fieldName} ${indexColumn.comment}#end")
+    /**
+     * 通过唯一键删除单个$!{tbl.comment}
+     * ${paramComments}
+     * @return 影响记录数
+     */
+    Integer $methodName(
+        ${paramNames}
+    );
+
+#end
+#if(${invalidColumnExists})
+#foreach($indexColumns in ${tbl.indexes})
+#set(${methodNameWithSuffix}="invalidBy#foreach($indexColumn in ${indexColumns})${indexColumn.fieldNameCap}And#end")
+#set(${methodName}="$methodNameWithSuffix.substring(0, $methodNameWithSuffix.length() - 3)")
+#set(${paramNamesWithSuffix}="#foreach($indexColumn in ${indexColumns})@Param(""${indexColumn.fieldName}"") ${indexColumn.javaType} ${indexColumn.fieldName}, #end")
+#set(${paramNames}="$paramNamesWithSuffix.substring(0, $paramNamesWithSuffix.length() - 2)")
+#set(${paramComments}="#foreach($indexColumn in ${indexColumns})
 
+     * @param ${indexColumn.fieldName} ${indexColumn.comment}#end")
+    /**
+     * 逻辑删除$!{tbl.comment}
+     * ${paramComments}
+     * @return 影响记录数
+     */
+    Integer $methodName(
+        ${paramNames}
+    );
+#end
+#end
 }
\ No newline at end of file