From 7a1b2baf3546f62f27327f5d4209ab4311069abc Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 24 五月 2023 08:57:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/stylefeng/guns/modular/system/model/DriverNote.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/stylefeng/guns/modular/system/model/DriverNote.java b/src/main/java/com/stylefeng/guns/modular/system/model/DriverNote.java
index 3c785ba..af5bcf6 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/model/DriverNote.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/model/DriverNote.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import java.util.Date;
@@ -12,9 +14,13 @@
@TableField("driver_id")
private Integer driverId;
@TableField("order_id")
+ @JsonSerialize(
+ using = ToStringSerializer.class
+ )
private Long orderId;
private String describe;
private Integer type;
@TableField("create_time")
private Date createTime;
+ private String category;
}
--
Gitblit v1.7.1