From 4114759a57d73661937f28a765fb8a67c017b14b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 24 六月 2025 16:28:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java
index c9dadf0..cfd4a73 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Wave.java
@@ -3,6 +3,7 @@
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;
@@ -43,6 +44,9 @@
@ApiModelProperty(value= "娉㈡鍙�")
private String code;
+ @ApiModelProperty("鎵ц鏁伴噺")
+ private Double workQty;
+
/**
* 娉㈡绫诲瀷 0: 鎵嬪姩 1: 鑷姩
*/
@@ -67,11 +71,17 @@
@ApiModelProperty(value= "宸插畬鎴愭暟閲�")
private Double qty;
+ @ApiModelProperty("鐩爣浣嶇疆")
+ private String targSite;
+
/**
* 鍗曟嵁鏁伴噺
*/
@ApiModelProperty(value= "鍗曟嵁鏁伴噺")
private Integer orderNum;
+
+ @ApiModelProperty("鍝佺被鏁伴噺")
+ private Integer groupQty;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
@@ -90,6 +100,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;
/**
@@ -103,6 +114,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