From b1643b619696f2578e22d7f3bcc2cacca63a1ce6 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 26 五月 2024 22:26:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java b/zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java
index 9110dc1..f010cb8 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java
@@ -48,11 +48,24 @@
private String idNo;
/**
- * 鏈夋晥鏈�
+ * 璇佷欢绫诲瀷
+ */
+ @Excel(name="璇佷欢绫诲瀷")
+ private String type;
+
+ /**
+ * 璧峰鏃堕棿
*/
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name="璇佷欢鏈夋晥鏈熻嚦",dateFormat = "yyyy-MM-dd")
- private Date validityDate;
+ @Excel(name="璇佷欢璧峰鏃堕棿",dateFormat = "yyyy-MM-dd")
+ private Date startTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name="璇佷欢缁撴潫鏃堕棿",dateFormat = "yyyy-MM-dd")
+ private Date endTime;
/**
* 鎸佹湁鎯呭喌
--
Gitblit v1.9.1