From c6ff75126f7e5a795d503272280dd3d72bcdb294 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 26 五月 2025 10:35:58 +0800
Subject: [PATCH] no message

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

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveItem.java
index 392b2ac..a8abbc7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveItem.java
@@ -1,18 +1,17 @@
 package com.vincent.rsf.server.manager.entity;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -151,6 +150,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;
 
     /**
@@ -164,6 +164,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;
 
     /**
@@ -173,6 +174,26 @@
     private Long updateBy;
 
     /**
+     * 鐩爣搴撲綅
+     */
+    @ApiModelProperty("鐩爣搴撲綅")
+    @TableField(exist = false)
+    private String stockLocs;
+
+    /**
+     * 搴撳瓨鏁伴噺
+     */
+    @ApiModelProperty("搴撳瓨鏁伴噺")
+    @TableField(exist = false)
+    private Double stockQty;
+
+
+    /***
+     * 鏄惁鍏ㄦ嫋鍑哄簱
+     */
+    @TableField(exist = false)
+    private Short flagAll;
+    /**
      * 澶囨敞
      */
     @ApiModelProperty(value= "澶囨敞")

--
Gitblit v1.9.1