From c414ff69c66e9b82871f6fbd9bbc7bf49431731f Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 19 五月 2025 20:16:46 +0800 Subject: [PATCH] 新增客户单号, 工单号,项目号 工作档新增仓库类型,添加仓库类型搜索 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 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 01e29f1..52d60b1 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; @@ -34,10 +35,8 @@ @Data @Accessors(chain = true) @TableName("man_task") +@ApiModel(value = "Task", description = "浠诲姟妗�") public class Task implements Serializable { - - private static final long serialVersionUID = 1L; - /** * ID */ @@ -56,6 +55,10 @@ */ @ApiModelProperty(value= "浠诲姟鐘舵��") private Short taskStatus; + + + @ApiModelProperty("浠撳簱绫诲瀷") + private Short warehType; /** * 浠诲姟绫诲瀷 @@ -147,7 +150,6 @@ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚� */ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ") - @TableLogic private Integer deleted; /** @@ -167,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; /** @@ -180,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; /** -- Gitblit v1.9.1