From f553a88e4eee070c24182e4c036db355becda35a Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 13 三月 2026 09:48:56 +0800
Subject: [PATCH] fix:循环依赖

---
 src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java b/src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java
index c91592e..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;
@@ -38,7 +42,8 @@
     @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