From a680a84d91fb6501951d0265e9b347695568c546 Mon Sep 17 00:00:00 2001
From: 抓蛙师 <770492966@qq.com>
Date: 星期二, 20 九月 2022 16:41:40 +0800
Subject: [PATCH] !236 前端适配多字段排序功能案例OSS页面（重新排序需点击重置按钮，否则按照点击顺序依次排序，重复点击的字段排序位置不发生改变） * 完善前端适配多字段排序功能案例OSS页面（完善排序图标显示效果和重置效果，支持正序，倒序，取消排序） * 前端适配多字段排序功能案例OSS页面（重新排序需点击重置按钮，否则按照点击顺序依次排序，重复点击的字段排序位置不发生改变）
---
ruoyi-generator/src/main/resources/vm/java/domain.java.vm | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 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 b6eca82..28ca34c 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -2,12 +2,19 @@
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
+import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
import java.math.BigDecimal;
-import com.ruoyi.common.annotation.Excel;
+
+#foreach ($import in $importList)
+import ${import};
+#end
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.domain.BaseEntity;
+#elseif($table.tree)
+import com.ruoyi.common.core.domain.TreeEntity;
+#end
/**
* ${functionName}瀵硅薄 ${tableName}
@@ -15,23 +22,23 @@
* @author ${author}
* @date ${datetime}
*/
+#if($table.crud || $table.sub)
+ #set($Entity="BaseEntity")
+#elseif($table.tree)
+ #set($Entity="TreeEntity<${ClassName}>")
+#end
@Data
-@NoArgsConstructor
-@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
@TableName("${tableName}")
-public class ${ClassName} implements Serializable {
+public class ${ClassName} extends ${Entity} {
private static final long serialVersionUID=1L;
#foreach ($column in $columns)
-
- /** $column.columnComment */
-#if($column.javaField=="createBy"||$column.javaField=="createTime")
- @TableField(fill = FieldFill.INSERT)
-#end
-#if($column.javaField=="updateBy"||$column.javaField=="updateTime")
- @TableField(fill = FieldFill.INSERT_UPDATE)
-#end
+#if(!$table.isSuperColumn($column.javaField))
+ /**
+ * $column.columnComment
+ */
#if($column.javaField=='delFlag')
@TableLogic
#end
@@ -43,5 +50,6 @@
#end
private $column.javaType $column.javaField;
#end
+#end
}
--
Gitblit v1.9.3