From bed735aae42b6e0c75bf3fd63d9cd0996fba9355 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 21 五月 2025 14:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 11 +++++++++--
1 files changed, 9 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 278ef22..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
@@ -4,6 +4,7 @@
import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
@@ -54,6 +55,10 @@
*/
@ApiModelProperty(value= "浠诲姟鐘舵��")
private Short taskStatus;
+
+
+ @ApiModelProperty("浠撳簱绫诲瀷")
+ private Short warehType;
/**
* 浠诲姟绫诲瀷
@@ -164,6 +169,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -177,6 +183,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
@@ -246,7 +253,7 @@
if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
return null;
}
- return dictDatas.getLabel();
+ return dictDatas.getValue() + "." + dictDatas.getLabel();
}
public String getTaskType$() {
@@ -260,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