From 7d3ad58a9a21cfd7e21fde604e362a2cfe812754 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 20 十一月 2025 15:03:21 +0800
Subject: [PATCH] #新增 1. 全板出库完成后,变更任务状态为拣料

---
 rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
index 1e05343..2b6481b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/system/entity/Tenant.java
@@ -4,11 +4,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.vincent.rsf.framework.common.Cools;
 import com.vincent.rsf.framework.common.SpringUtils;
 import com.vincent.rsf.server.system.service.UserService;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
@@ -55,19 +57,22 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
-    @TableLogic
     private Integer deleted;
 
     /**
      * 娣诲姞鏃堕棿
      */
     @ApiModelProperty(value= "娣诲姞鏃堕棿")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date createTime;
 
     /**
      * 淇敼鏃堕棿
      */
     @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