From 5ec8d62c24fc5844d1b88a91398178856ec76b12 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期四, 08 五月 2025 15:46:17 +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 | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 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 aacf18f..09322b3 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
@@ -2,11 +2,13 @@
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import java.math.BigDecimal;
+import java.util.Date;
/**
* 宸ュ崟鍚屾瀵硅薄 aps_work_order_job
@@ -130,14 +132,42 @@
private String orgCode;
/** 褰撳墠宸ュ簭鐘舵�� */
+ @JsonProperty("OpStatus")
@Excel(name = "褰撳墠宸ュ簭鐘舵��")
private String opStatus;
/** 涓嬩竴宸ュ簭鍚嶇О */
+ @JsonProperty("NextOpName")
@Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
private String nextOpName;
- public void setId(Long id)
+ /**
+ * 浣庨樁鐮�
+ */
+ private String lowOrderCode;
+
+ /** 宸ュ崟鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date orderCreateTime;
+
+ public String getLowOrderCode() {
+ return lowOrderCode;
+ }
+
+ public void setLowOrderCode(String lowOrderCode) {
+ this.lowOrderCode = lowOrderCode;
+ }
+
+ public Date getOrderCreateTime() {
+ return orderCreateTime;
+ }
+
+ public void setOrderCreateTime(Date orderCreateTime) {
+ this.orderCreateTime = orderCreateTime;
+ }
+
+ public void setId(Long id)
{
this.id = id;
}
--
Gitblit v1.9.3