From 1769107c38d40f7d209a48ab7752fe27a81b9709 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 14 四月 2026 17:48:18 +0800
Subject: [PATCH] fix:1.出库台账(删除出库记录查询结果有误)增加批号和供应商 2.出入库不合格管理加批号和供应商 3.发货以及发货记录(部分发货)
---
src/main/java/com/ruoyi/basic/excel/SupplierManageExcelDto.java | 12 +++++++++---
1 files changed, 9 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..7637a7d 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,10 @@
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
+
+ @ApiModelProperty(value = "渚涘簲鍟嗙被鍨�")
+ @Excel(name = "渚涘簲鍟嗙被鍨�")
+ private String supplierType;
@Excel(name = "绾崇◣浜鸿瘑鍒彿")
private String taxpayerIdentificationNum;
@@ -38,7 +43,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