From c12dc71ecea33d5c23e2ceb32bfc3db68e4198e3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 23 六月 2021 09:44:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'

---
 ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestTreeVo.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestTreeVo.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestTreeVo.java
index 44413b1..c6ea558 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestTreeVo.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/vo/TestTreeVo.java
@@ -1,10 +1,13 @@
 package com.ruoyi.demo.vo;
 
-import com.ruoyi.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
 import java.util.Date;
 
 
@@ -23,6 +26,7 @@
 
 	/** 涓婚敭 */
 	@ApiModelProperty("涓婚敭")
+	@JsonSerialize(using = ToStringSerializer.class)
 	private Long id;
 
 	/** 鐖秈d */

--
Gitblit v1.9.3