From 1556f13379b25d15daba1b7414b1dcf8f1b24080 Mon Sep 17 00:00:00 2001
From: zhengjie <201507802@qq.com>
Date: Tue, 22 Dec 2020 20:03:50 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.6)?=
 =?UTF-8?q?=EF=BC=9A=E4=BD=BF=E7=94=A8=20fastJson=20=E9=98=B2=E6=AD=A2=20L?=
 =?UTF-8?q?ong=20=E7=B2=BE=E5=BA=A6=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/me/zhengjie/modules/system/domain/vo/MenuVo.java   | 1 -
 .../src/main/resources/template/generator/admin/Dto.ftl     | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java
index f3352a0e..82fc0cc5 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/domain/vo/MenuVo.java
@@ -17,7 +17,6 @@ package me.zhengjie.modules.system.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
-
 import java.io.Serializable;
 import java.util.List;
 
diff --git a/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl b/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl
index e4e1242f..e388a0b4 100644
--- a/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl
+++ b/eladmin-system/src/main/resources/template/generator/admin/Dto.ftl
@@ -24,8 +24,8 @@ import java.math.BigDecimal;
 </#if>
 import java.io.Serializable;
 <#if !auto && pkColumnType = 'Long'>
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.ToStringSerializer;
 </#if>
 
 /**
@@ -45,7 +45,7 @@ public class ${className}Dto implements Serializable {
     <#if column.columnKey = 'PRI'>
     <#if !auto && pkColumnType = 'Long'>
     /** 防止精度丢失 */
-    @JsonSerialize(using= ToStringSerializer.class)
+    @JSONField(serializeUsing = ToStringSerializer.class)
     </#if>
     </#if>
     private ${column.columnType} ${column.changeColumnName};