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 }