From c7b7deaf184ca5bc1f12c94ce2214ff2e5b58fa3 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期三, 24 一月 2024 13:50:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
index faf27ba..a61ca36 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/passingStationCollection/domain/DaPassingStationCollection.java
@@ -45,13 +45,13 @@
private String equipmentNo;
/** 鍏ョ珯鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍏ョ珯鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍏ョ珯鏃堕棿")
private Date inboundTime;
/** 鍑虹珯鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍑虹珯鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "鍑虹珯鏃堕棿")
private Date outboundTime;
/** 鍏ョ珯鏄惁鍚堟牸 */
@@ -71,8 +71,8 @@
private String outMsgSign;
/** 閲囬泦鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "閲囬泦鏃堕棿")
private Date collectionTime;
/** 棰勭暀瀛楁1 */
@@ -91,7 +91,17 @@
@Excel(name = "鑺傛媿鏃堕棿")
private String beatTime;
- public void setId(Long id)
+ private Long[] ids;
+
+ public Long[] getIds() {
+ return ids;
+ }
+
+ public void setIds(Long[] ids) {
+ this.ids = ids;
+ }
+
+ public void setId(Long id)
{
this.id = id;
}
--
Gitblit v1.9.3