From 3f50e9e810b478dbbd3225d9e5cedf47f586b69b Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 05 九月 2023 11:25:43 +0800
Subject: [PATCH] 45386
---
zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java | 88 +++++++++++++++++--------------------------
1 files changed, 35 insertions(+), 53 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 aea9ba8..f010cb8 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZCertificate.java
@@ -3,8 +3,14 @@
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.time.LocalDateTime;
+import java.util.Date;
/**
* <p>
@@ -14,83 +20,59 @@
* @author ojq
* @since 2023-03-14
*/
+@Data
+@ToString
@TableName("z_certificate")
public class ZCertificate implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ private Long id;
/**
* 鐢ㄦ埛id
*/
- private Integer userId;
+ private Long userId;
/**
* 璇佷欢鍚嶇О
*/
+ @Excel(name = "璇佷欢鍚嶇О")
private String cerName;
/**
* 璇佷欢鍙风爜
*/
+ @Excel(name="璇佷欢鍙风爜")
private String idNo;
/**
- * 鏈夋晥鏈�
+ * 璇佷欢绫诲瀷
*/
- private LocalDateTime validityDate;
+ @Excel(name="璇佷欢绫诲瀷")
+ private String type;
+
+ /**
+ * 璧峰鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name="璇佷欢璧峰鏃堕棿",dateFormat = "yyyy-MM-dd")
+ private Date startTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name="璇佷欢缁撴潫鏃堕棿",dateFormat = "yyyy-MM-dd")
+ private Date endTime;
+
+ /**
+ * 鎸佹湁鎯呭喌
+ */
+ @Excel(name = "鎸佹湁鎯呭喌")
+ private String ownStatus;
- public Integer getId() {
- return id;
- }
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Integer getUserId() {
- return userId;
- }
-
- public void setUserId(Integer userId) {
- this.userId = userId;
- }
-
- public String getCerName() {
- return cerName;
- }
-
- public void setCerName(String cerName) {
- this.cerName = cerName;
- }
-
- public String getIdNo() {
- return idNo;
- }
-
- public void setIdNo(String idNo) {
- this.idNo = idNo;
- }
-
- public LocalDateTime getValidityDate() {
- return validityDate;
- }
-
- public void setValidityDate(LocalDateTime validityDate) {
- this.validityDate = validityDate;
- }
-
- @Override
- public String toString() {
- return "ZCertificate{" +
- "id=" + id +
- ", userId=" + userId +
- ", cerName=" + cerName +
- ", idNo=" + idNo +
- ", validityDate=" + validityDate +
- "}";
- }
}
--
Gitblit v1.9.1