From cd34c87afa730c48e2b2be61d700b1fee409e02c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 12 七月 2021 11:00:12 +0800
Subject: [PATCH] fix 修复升级合并错误
---
ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
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 6fd4695..5832be6 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -6,13 +6,11 @@
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
-import java.util.Map;
-import java.util.HashMap;
import java.math.BigDecimal;
/**
* ${functionName}瀵硅薄 ${tableName}
- *
+ *
* @author ${author}
* @date ${datetime}
*/
@@ -22,7 +20,7 @@
@TableName("${tableName}")
public class ${ClassName} implements Serializable {
-private static final long serialVersionUID=1L;
+ private static final long serialVersionUID=1L;
#foreach ($column in $columns)
@@ -36,6 +34,9 @@
#if($column.javaField=='delFlag')
@TableLogic
#end
+#if($column.javaField=='version')
+ @Version
+#end
#if($column.isPk==1)
@TableId(value = "$column.columnName")
#end
--
Gitblit v1.9.3