diff --git a/src/test/resources/template/controller.vm b/src/test/resources/template/controller.vm
index 15b3dbf..ccd4fbd 100644
--- a/src/test/resources/template/controller.vm
+++ b/src/test/resources/template/controller.vm
@@ -1,13 +1,22 @@
 package ${cls.packageName};
 
 import org.springframework.web.bind.annotation.RestController;
+#define($authorComment)
+#if(${ext.author} && ${ext.author} != "")
+
+ * @author ${ext.author}#end
+#end
+#define($versionComment)
+#if(${ext.version} && ${ext.version} != "")
+
+ * @version ${ext.version}#end
+#end
+#set(${ClassName}="${cls.className}$!{cls.controllerNameSuffix}")
 
 /**
  * $!{tbl.comment}控制器
- *
- * @author $!{ext.author}
- * @version $!{ext.version}
+ * ${authorComment}${versionComment}
  */
 @RestController
-public class ${cls.className}$!{cls.controllerNameSuffix} {
+public class ${ClassName} {
 }
\ No newline at end of file
diff --git a/src/test/resources/template/form.vm b/src/test/resources/template/form.vm
index dcba814..6c48f02 100644
--- a/src/test/resources/template/form.vm
+++ b/src/test/resources/template/form.vm
@@ -1,10 +1,19 @@
 package ${cls.packageName};
+#define($authorComment)
+#if(${ext.author} && ${ext.author} != "")
+
+ * @author ${ext.author}#end
+#end
+#define($versionComment)
+#if(${ext.version} && ${ext.version} != "")
+
+ * @version ${ext.version}#end
+#end
+#set(${ClassName}="${cls.className}$!{cls.formNameSuffix}")
 
 /**
  * $!{tbl.comment}表单提交
- *
- * @author $!{ext.author}
- * @version $!{ext.version}
+ * ${authorComment}${versionComment}
  */
-public class ${cls.className}$!{cls.formNameSuffix} {
+public class ${ClassName} {
 }
\ No newline at end of file
diff --git a/src/test/resources/template/mapper.vm b/src/test/resources/template/mapper.vm
index dbd7d11..785b0a0 100644
--- a/src/test/resources/template/mapper.vm
+++ b/src/test/resources/template/mapper.vm
@@ -1,10 +1,19 @@
 package ${cls.packageName};
 
+#define($authorComment)
+#if(${ext.author} && ${ext.author} != "")
+
+ * @author ${ext.author}#end
+#end
+#define($versionComment)
+#if(${ext.version} && ${ext.version} != "")
+
+ * @version ${ext.version}#end
+#end
+#set(${ClassName}="${cls.className}$!{cls.mapperNameSuffix}")
 /**
  * $!{tbl.comment}数据访问
- *
- * @author $!{ext.author}
- * @version $!{ext.version}
+ * ${authorComment}${versionComment}
  */
-public class ${cls.className}$!{cls.mapperNameSuffix} {
+public class ${ClassName} {
 }
\ No newline at end of file
diff --git a/src/test/resources/template/po.vm b/src/test/resources/template/po.vm
index e3efe79..343babd 100644
--- a/src/test/resources/template/po.vm
+++ b/src/test/resources/template/po.vm
@@ -1,9 +1,19 @@
 package ${cls.packageName};
+
+#define($authorComment)
+#if(${ext.author} && ${ext.author} != "")
+
+ * @author ${ext.author}#end
+#end
+#define($versionComment)
+#if(${ext.version} && ${ext.version} != "")
+
+ * @version ${ext.version}#end
+#end
+#set(${ClassName}="${cls.className}$!{cls.poNameSuffix}")
 /**
  * $!{tbl.comment}数据实体
- *
- * @author $!{ext.author}
- * @version $!{ext.version}
+ * ${authorComment}${versionComment}
  */
-public class ${cls.className}$!{cls.poNameSuffix} {
+public class ${ClassName} {
 }
\ No newline at end of file
diff --git a/src/test/resources/template/query.vm b/src/test/resources/template/query.vm
index 22e3a69..2de0ff4 100644
--- a/src/test/resources/template/query.vm
+++ b/src/test/resources/template/query.vm
@@ -1,10 +1,18 @@
 package ${cls.packageName};
+#define($authorComment)
+#if(${ext.author} && ${ext.author} != "")
 
+ * @author ${ext.author}#end
+#end
+#define($versionComment)
+#if(${ext.version} && ${ext.version} != "")
+
+ * @version ${ext.version}#end
+#end
+#set(${ClassName}="${cls.className}$!{cls.queryNameSuffix}")
 /**
  * $!{tbl.comment}查询
- *
- * @author $!{ext.author}
- * @version $!{ext.version}
+ * ${authorComment}${versionComment}
  */
 public class ${cls.className}$!{cls.queryNameSuffix} {
 
diff --git a/src/test/resources/template/service.interface.vm b/src/test/resources/template/service.interface.vm
index 5bf47f4..6210b82 100644
--- a/src/test/resources/template/service.interface.vm
+++ b/src/test/resources/template/service.interface.vm
@@ -1,11 +1,20 @@
 package ${cls.packageName};
+#define($authorComment)
+#if(${ext.author} && ${ext.author} != "")
+
+ * @author ${ext.author}#end
+#end
+#define($versionComment)
+#if(${ext.version} && ${ext.version} != "")
+
+ * @version ${ext.version}#end
+#end
+#set($InterfaceName="$!{cls.servieInterfaceNamePrefix}${cls.className}$!{cls.serviceNameSuffix}")
 
 /**
  * $!{tbl.comment}服务接口
- *
- * @author $!{ext.author}
- * @version $!{ext.version}
+ * ${authorComment}${versionComment}
  */
-public interface $!{cls.servieInterfaceNamePrefix}${cls.className}$!{cls.serviceNameSuffix} {
+public interface $InterfaceName {
 
 }
\ No newline at end of file
diff --git a/src/test/resources/template/service.vm b/src/test/resources/template/service.vm
index 5708aa8..b44d4bd 100644
--- a/src/test/resources/template/service.vm
+++ b/src/test/resources/template/service.vm
@@ -2,12 +2,22 @@ package ${cls.packageName};
 
 import ${cls.interfacePackageName}.$!{cls.servieInterfaceNamePrefix}${cls.className}$!{cls.serviceNameSuffix};
 
+#define($authorComment)
+#if(${ext.author} && ${ext.author} != "")
+
+ * @author ${ext.author}#end
+#end
+#define($versionComment)
+#if(${ext.version} && ${ext.version} != "")
+
+ * @version ${ext.version}#end
+#end
+#set(${ClassName}="${cls.className}$!{cls.serviceNameSuffix}")
+#set(${InterfaceName}="$!{cls.servieInterfaceNamePrefix}${cls.className}$!{cls.serviceNameSuffix}")
 /**
  * $!{tbl.comment}服务
- *
- * @author $!{ext.author}
- * @version $!{ext.version}
+ * ${authorComment}${versionComment}
  */
-public class ${cls.className}$!{cls.serviceNameSuffix} implements $!{cls.servieInterfaceNamePrefix}${cls.className}$!{cls.serviceNameSuffix} {
+public class ${ClassName} implements ${InterfaceName} {
 
 }
\ No newline at end of file
diff --git a/src/test/resources/template/view.vm b/src/test/resources/template/view.vm
index 1d4bf39..6c4a0ea 100644
--- a/src/test/resources/template/view.vm
+++ b/src/test/resources/template/view.vm
@@ -1,11 +1,20 @@
 package ${cls.packageName};
 
+#define($authorComment)
+#if(${ext.author} && ${ext.author} != "")
+
+ * @author ${ext.author}#end
+#end
+#define($versionComment)
+#if(${ext.version} && ${ext.version} != "")
+
+ * @version ${ext.version}#end
+#end
+#set(${ClassName}="${cls.className}$!{cls.viewNameSuffix}")
 /**
  * $!{tbl.comment}视图
- *
- * @author $!{ext.author}
- * @version $!{ext.version}
+ * ${authorComment}${versionComment}
  */
-public class ${cls.className}$!{cls.viewNameSuffix} {
+public class ${ClassName} {
 
 }
\ No newline at end of file