From 462c16ca4ec52bdea6cbb35514e8fd78d6b5f38c Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 17 五月 2023 15:20:00 +0800
Subject: [PATCH] 合并不行
---
zhang-content/src/main/java/com/ruoyi/domain/ZfDoctor.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfDoctor.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfDoctor.java
index d8200f8..afa9cb8 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfDoctor.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfDoctor.java
@@ -3,11 +3,13 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import lombok.ToString;
import java.io.Serializable;
+import java.util.Date;
/**
* <p>
@@ -48,13 +50,13 @@
/**
* 涓尰
*/
- @Excel(name = "涓尰")
+ @Excel(name = "涓尰澶勬柟")
private String cmedical;
/**
* 瑗垮尰
*/
- @Excel(name = "瑗垮尰")
+ @Excel(name = "瑗垮尰澶勬柟")
private String wmedical;
/**
@@ -77,4 +79,7 @@
private String url;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
+
}
--
Gitblit v1.9.1