From 57e23c353a177b9c003a2f524a2adeaf641e2e4c Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 16 八月 2024 17:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskLog.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskLog.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskLog.java
index fc5c86e..0d7ed7c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskLog.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/TaskLog.java
@@ -192,7 +192,7 @@
TaskStsService service = SpringUtils.getBean(TaskStsService.class);
TaskSts taskSts = service.getById(this.taskSts);
if (!Cools.isEmpty(taskSts)){
- return String.valueOf(taskSts.getId());
+ return String.valueOf(taskSts.getTitle());
}
return null;
}
@@ -201,7 +201,7 @@
TaskTypeService service = SpringUtils.getBean(TaskTypeService.class);
TaskType taskType = service.getById(this.taskType);
if (!Cools.isEmpty(taskType)){
- return String.valueOf(taskType.getId());
+ return String.valueOf(taskType.getTitle());
}
return null;
}
--
Gitblit v1.9.1