From 6192d425642f1205f650e16157dbef2a15007978 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Sun, 30 May 2021 02:18:34 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-generator/src/main/resources/vm/java/addBo.java.vm   | 1 +
 ruoyi-generator/src/main/resources/vm/java/domain.java.vm  | 7 +++++--
 ruoyi-generator/src/main/resources/vm/java/service.java.vm | 1 +
 ruoyi-generator/src/main/resources/vm/java/vo.java.vm      | 4 +++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm b/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm
index 98a14970..e010d203 100644
--- a/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm
@@ -24,6 +24,7 @@ public class ${ClassName}AddBo {
 
 #foreach ($column in $columns)
 #if($column.isInsert && $column.isPk!=1)
+
     /** $column.columnComment */
     @ApiModelProperty("$column.columnComment")
 #if($column.javaType == 'Date')
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index b06144cb..b6eca827 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -11,7 +11,7 @@ import com.ruoyi.common.annotation.Excel;
 
 /**
  * ${functionName}对象 ${tableName}
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
@@ -21,7 +21,7 @@ import com.ruoyi.common.annotation.Excel;
 @TableName("${tableName}")
 public class ${ClassName} implements Serializable {
 
-private static final long serialVersionUID=1L;
+    private static final long serialVersionUID=1L;
 
 #foreach ($column in $columns)
 
@@ -35,6 +35,9 @@ private static final long serialVersionUID=1L;
 #if($column.javaField=='delFlag')
     @TableLogic
 #end
+#if($column.javaField=='version')
+    @Version
+#end
 #if($column.isPk==1)
     @TableId(value = "$column.columnName")
 #end
diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
index 05616603..d5016d43 100644
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -32,6 +32,7 @@ public interface I${ClassName}Service extends IServicePlus<${ClassName}> {
 	 */
     TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}QueryBo bo);
 #end
+
 	/**
 	 * 查询列表
 	 */
diff --git a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
index 0746f0cb..87f72090 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -13,7 +13,7 @@ import java.util.Date;
 
 
 /**
- * ${functionName}视图对象 mall_package
+ * ${functionName}视图对象 ${tableName}
  *
  * @author ${author}
  * @date ${datetime}
@@ -21,6 +21,7 @@ import java.util.Date;
 @Data
 @ApiModel("${functionName}视图对象")
 public class ${ClassName}Vo {
+
 	private static final long serialVersionUID = 1L;
 
 	/** $pkColumn.columnComment */
@@ -46,6 +47,7 @@ public class ${ClassName}Vo {
 #end
 	@ApiModelProperty("$column.columnComment")
 	private $column.javaType $column.javaField;
+
 #end
 #end