From 4eeb403ab81c2cd88e2f8004913afff64f0142e3 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 27 二月 2026 17:46:01 +0800
Subject: [PATCH] 设备保养-任务记录增加备注字段； 供应商档案增加供应商类型字段，由字典维护；
---
src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
index a37252e..b3edb9d 100644
--- a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
+++ b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
@@ -5,6 +5,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@@ -13,6 +14,9 @@
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
+
+ @Excel(name = "渚涘簲鍟嗙被鍨�")
+ private String supplierType;
@Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNum;
@@ -35,10 +39,11 @@
@Excel(name = "鑱旂郴鐢佃瘽")
private String contactUserPhone;
- @Excel(name = "缁存姢浜篒D")
- private Integer maintainUserId;
+ @Excel(name = "缁存姢浜�")
+ private String maintainUserName;
- @Excel(name = "缁存姢鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime maintainTime;
+// @Excel(name = "缁存姢鏃堕棿")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+// private LocalDateTime maintainTime;
}
--
Gitblit v1.9.3