From bd56825b00f131000b721f4fa2e4619c56a612a0 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 10 七月 2025 20:57:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java
index 5d3ecea..acce3aa 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekInspectionDetail.java
@@ -46,7 +46,7 @@
private Date planInspectionDate;
/**鐐规缁撴灉*/
@Excel(name = "鐐规缁撴灉", width = 15)
- @ApiModelProperty(value = "鐐规缁撴灉-姝ｅ父-寮傚父")
+ @ApiModelProperty(value = "鐐规缁撴灉-姝ｅ父-寮傚父-鍏虫満-鏁呴殰")
private String inspectionResult;
/**寮傚父鎻忚堪*/
@Excel(name = "寮傚父鎻忚堪", width = 15)
@@ -69,10 +69,11 @@
@Excel(name = "鐐规浜�", width = 15)
@ApiModelProperty(value = "鐐规浜�")
private String inspector;
- /**鐐规鏃堕棿*/
- @Excel(name = "鐐规鏃堕棿", width = 15)
+ @Excel(name = "鐐规鏃堕棿锛堝疄闄咃級", width = 15, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鐐规鏃堕棿")
- private String inspectTime;
+ private Date inspectTime;
public EamWeekInspectionDetail(){}
--
Gitblit v1.9.3