From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/label/entity/LabelEntity.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/label/entity/LabelEntity.java b/src/main/java/org/springblade/modules/label/entity/LabelEntity.java
index eac3c67..8e02e54 100644
--- a/src/main/java/org/springblade/modules/label/entity/LabelEntity.java
+++ b/src/main/java/org/springblade/modules/label/entity/LabelEntity.java
@@ -18,12 +18,10 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@@ -54,6 +52,7 @@
/** 标签名称 */
@ApiModelProperty(value = "标签名称", example = "")
@TableField("label_name")
+ @JsonProperty("name")
private String labelName;
/** 排序 */
--
Gitblit v1.9.3