From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessQuantityDto.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessQuantityDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessQuantityDto.java
index 4ae2e90..79d2514 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessQuantityDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcProcessQuantityDto.java
@@ -1,9 +1,7 @@
package org.jeecg.modules.mdc.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -16,7 +14,7 @@
private String id;
@Excel(name = "璁惧缂栧彿", width = 15)
private String equipmentId;
- @Excel(name = "璁惧鍚嶇О", width = 15)
+ @Excel(name = "璁惧鍚嶇О", width = 20)
private String equipmentName;
@Excel(name = "闆朵欢鍙�", width = 15)
private String partsCode;
@@ -25,10 +23,8 @@
@Excel(name = "绋嬪簭鍙�", width = 15)
private String sequenceNumber;
private String standardId;
- @Excel(name = "鏃ユ湡", width = 15, format = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date efficientDate;
+ @Excel(name = "鏃ユ湡", width = 15)
+ private String efficientDate;
@Excel(name = "鍔犲伐鏁伴噺", width = 15)
private Integer processQuantity;
@Excel(name = "鏃堕暱锛堝垎閽燂級", width = 15)
--
Gitblit v1.9.3