From a0346043f646da19118bb446d85430f3d30af3f3 Mon Sep 17 00:00:00 2001
From: zhujunjieit <zhujunjie>
Date: Fri, 7 Dec 2018 23:00:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/vm/java/domain.java.vm | 63 ++++++++++---------
 1 file changed, 34 insertions(+), 29 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 e2ccb709e..3f6326452 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -4,47 +4,52 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.base.BaseEntity;
 #foreach ($column in $columns)
-#if($column.attrType == 'Date')
-import javax.persistence.Id;
-import java.util.Date;
-#break
-#end
+	#if($column.attrType == 'Date')
+    import javax.persistence.Id;
+    import java.util.Date;
+		#break
+	#end
 #end
 
 /**
  * ${tableComment}表 ${tableName}
- * 
+ *
  * @author ${author}
  * @date ${datetime}
  */
 public class ${className}
 {
-	private static final long serialVersionUID = 1L;
-	
-#foreach ($column in $columns)
-	/** $column.columnComment */
-	private $column.attrType $column.attrname;
-#end
+private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
-	/** 设置$column.columnComment */
-	public void set${column.attrName}($column.attrType $column.attrname) 
-	{
-		this.$column.attrname = $column.attrname;
-	}
-
-	/** 获取$column.columnComment */
-	public $column.attrType get${column.attrName}() 
-	{
-		return $column.attrname;
-	}
+        /** $column.columnComment */
+	#if($column.columnName == $primaryKey.columnName)
+	@Id
+    private $column.attrType $column.attrname;
+	#else
+    private $column.attrType $column.attrname;
+	#end
 #end
 
-    public String toString() {
+	#foreach ($column in $columns)
+    /** 设置$column.columnComment */
+    public void set${column.attrName}($column.attrType $column.attrname)
+            {
+            this.$column.attrname = $column.attrname;
+            }
+
+    /** 获取$column.columnComment */
+    public $column.attrType get${column.attrName}()
+            {
+            return $column.attrname;
+            }
+	#end
+
+public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $columns)
+	#foreach ($column in $columns)
             .append("${column.attrname}", get${column.attrName}())
-#end
-            .toString();
-    }
-}
+	#end
+        .toString();
+        }
+        }