From 71eed1baf6de1de2545f88482839d9051ac86f5a Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 14:50:43 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
index 09322b3..1387e3a 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
@@ -141,16 +141,44 @@
@Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
private String nextOpName;
- /**
- * 浣庨樁鐮�
- */
+ /** 浣庨樁鐮� */
+ @JsonProperty("LowLevelCode")
private String lowOrderCode;
/** 宸ュ崟鍒涘缓鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonProperty("CreatedOn")
private Date orderCreateTime;
+ /** 宸ュ崟瀹℃牳鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "宸ュ崟瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonProperty("ApproveOn")
+ private Date approveOn;
+
+ /** 宸ュ崟寮�宸ユ椂闂� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "宸ュ崟寮�宸ユ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @JsonProperty("StartDatetime")
+ private Date startWorkDate;
+
+ public Date getApproveOn() {
+ return approveOn;
+ }
+
+ public void setApproveOn(Date approveOn) {
+ this.approveOn = approveOn;
+ }
+
+ public Date getStartWorkDate() {
+ return startWorkDate;
+ }
+
+ public void setStartWorkDate(Date startWorkDate) {
+ this.startWorkDate = startWorkDate;
+ }
+
public String getLowOrderCode() {
return lowOrderCode;
}
--
Gitblit v1.9.3