From d668c213bbcccd83acb57056a6b7919fda7e6d2d Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 28 四月 2025 11:55:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java | 2 ++
1 files changed, 2 insertions(+), 0 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..a97966b 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
@@ -130,10 +130,12 @@
private String orgCode;
/** 褰撳墠宸ュ簭鐘舵�� */
+ @JsonProperty("OpStatus")
@Excel(name = "褰撳墠宸ュ簭鐘舵��")
private String opStatus;
/** 涓嬩竴宸ュ簭鍚嶇О */
+ @JsonProperty("NextOpName")
@Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
private String nextOpName;
--
Gitblit v1.9.3