From 92a30abbdc9f65cb1a45a65e39cbfd3f6b52461e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 21 五月 2025 14:06:26 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index 52d60b1..af97c8d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -253,7 +253,7 @@
         if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
             return null;
         }
-        return dictDatas.getLabel();
+        return dictDatas.getValue() + "." + dictDatas.getLabel();
     }
 
     public String getTaskType$() {
@@ -267,7 +267,7 @@
         if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
             return null;
         }
-        return dictDatas.getLabel();
+        return dictDatas.getValue() + "." + dictDatas.getLabel();
     }
 
     public String getStartTime$(){

--
Gitblit v1.9.1