From 2023de973e6adb490bba962b1d830fd8e4be9418 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:22:30 +0800
Subject: [PATCH] update 适配 新序列化注解

---
 ruoyi-generator/src/main/resources/vm/java/vo.java.vm |   26 ++++++++++----------------
 1 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
index e97cd24..9c51e59 100644
--- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -7,9 +7,10 @@
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
 import java.util.Date;
 
 
@@ -21,20 +22,14 @@
  * @date ${datetime}
  */
 @Data
-@ApiModel("${functionName}瑙嗗浘瀵硅薄")
 @ExcelIgnoreUnannotated
-public class ${ClassName}Vo {
+public class ${ClassName}Vo implements Serializable {
 
-	private static final long serialVersionUID = 1L;
-
-	/**
-     *  $pkColumn.columnComment
-     */
-	@ApiModelProperty("$pkColumn.columnComment")
-	private ${pkColumn.javaType} ${pkColumn.javaField};
+    @Serial
+    private static final long serialVersionUID = 1L;
 
 #foreach ($column in $columns)
-#if($column.isList && $column.isPk!=1)
+#if($column.isList)
     /**
      * $column.columnComment
      */
@@ -48,13 +43,12 @@
     @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
     @ExcelDictFormat(dictType = "${column.dictType}")
 #elseif($parentheseIndex != -1)
-	@ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+    @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
 #else
-	@ExcelProperty(value = "${comment}")
+    @ExcelProperty(value = "${comment}")
 #end
-	@ApiModelProperty("$column.columnComment")
-	private $column.javaType $column.javaField;
+    private $column.javaType $column.javaField;
 
 #end
 #end

--
Gitblit v1.9.3