From 0ba48df61e2dc174f5de171856cdb038f3b72e52 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: Mon, 24 Feb 2020 10:19:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20v2.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/package.json                           | 2 +-
 ruoyi/src/main/resources/vm/java/domain.java.vm | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index ca55fd66..326d223c 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -56,7 +56,7 @@
     "screenfull": "4.2.0",
     "vue": "2.6.10",
     "vue-count-to": "1.0.13",
-	"vue-quill-editor": "3.0.6",
+    "vue-quill-editor": "3.0.6",
     "vue-cropper": "0.4.9",
     "vue-router": "3.0.2",
     "vue-splitpane": "1.0.4",
diff --git a/ruoyi/src/main/resources/vm/java/domain.java.vm b/ruoyi/src/main/resources/vm/java/domain.java.vm
index bc4bf862..39697b76 100644
--- a/ruoyi/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi/src/main/resources/vm/java/domain.java.vm
@@ -64,16 +64,8 @@ private static final long serialVersionUID=1L;
 #if($column.isPk==1)
     @TableId(value = "$column.columnName", type = IdType.AUTO)
     private $column.javaType $column.javaField;
-
-#end
-#end
-#foreach ($column in $columns)
-#if(!$table.isSuperColumn($column.javaField))
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
 #else
     private $column.javaType $column.javaField;
 #end
 #end
-#end
 }