From 824d4e6be22a1d101897bf1be575bb5e3ed33845 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期二, 09 十二月 2025 15:12:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/BizBaseEntity.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/BizBaseEntity.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/BizBaseEntity.java
index 07b464b..67da921 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/BizBaseEntity.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/BizBaseEntity.java
@@ -2,13 +2,11 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.common.annotation.Excel;
import lombok.Data;
import javax.persistence.*;
import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
/**
*
@@ -25,11 +23,13 @@
private String companyId;
/** 鍒涘缓浜� */
+ @Excel(name = "鍒涘缓鑰�",sort = 25)
@Column(name = "create_by", columnDefinition = "VARCHAR(100) COMMENT '鍒涘缓浜�'", nullable = false)
@TableField("create_by")
private String createBy;
/** 鍒涘缓鏃堕棿 */
+ @Excel(name = "鍒涘缓鏃堕棿",sort = 26, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "create_time", columnDefinition = "DATETIME COMMENT '鍒涘缓鏃堕棿'", nullable = false)
@Temporal(TemporalType.TIMESTAMP)
@@ -37,11 +37,13 @@
private Date createTime;
/** 鏇存柊浜� */
+ @Excel(name = "鏇存柊鑰�",sort = 27)
@Column(name = "update_by", columnDefinition = "VARCHAR(100) COMMENT '鏇存柊浜�'")
@TableField("update_by")
private String updateBy;
/** 鏇存柊鏃堕棿 */
+ @Excel(name = "鏇存柊鏃堕棿",sort = 28, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name = "update_time", columnDefinition = "DATETIME COMMENT '鏇存柊鏃堕棿'")
@Temporal(TemporalType.TIMESTAMP)
--
Gitblit v1.9.3