From d77aa9268ed02e7bda8a67aab2213e42cb5afcf4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 08 六月 2023 13:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
index 3131227..af3c879 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TDriver.java
@@ -9,6 +9,7 @@
 import com.baomidou.mybatisplus.annotations.TableName;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 
@@ -170,6 +171,7 @@
     private String areaName;
 
     @ApiModelProperty(value = "驾驶证初次领证时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date firstCertificateTime;
     @ApiModelProperty(value = "佣金")
     private BigDecimal commission;

--
Gitblit v1.7.1