From ec03bfa81ac2000000eef30036e77298352bdc41 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 23 四月 2026 16:19:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java b/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java
index 25b0cfd..b31f700 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionPrintOrder.java
@@ -7,11 +7,13 @@
import java.util.List;
import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.production.dto.MaterialInfoDto;
import com.ruoyi.production.dto.PlateMakingDto;
import com.ruoyi.production.dto.ProcessContentDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 鍗板埛瀹氬嵃鍗�
@@ -35,19 +37,23 @@
/**
* 瀵瑰簲鐨勭敓浜у伐鍗�
*/
- @TableField(value = "product_order")
- private Long productOrder;
+ @TableField(value = "product_order_id")
+ private Long productOrderId;
/**
* 鍒跺崟鏃ユ湡
*/
@TableField(value = "print_order_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime printOrderTime;
/**
* 瀹屾垚鏃ユ湡
*/
@TableField(value = "finish_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime finishTime;
/**
@@ -186,12 +192,16 @@
*
*/
@TableField(value = "create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
*
*/
@TableField(value = "update_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
@TableField(exist = false)
@@ -216,4 +226,22 @@
@TableField(value = "update_user_name", fill = FieldFill.INSERT_UPDATE)
private String updateUserName;
+
+ /**
+ * 灏忕洅鏁伴噺
+ */
+ @TableField(value = "small_box_qty")
+ private String smallBoxQty;
+
+ /**
+ * 涓洅鏁伴噺
+ */
+ @TableField(value = "medium_box_qty")
+ private String mediumBoxQty;
+
+ /**
+ * 鎴愬搧id
+ */
+ @TableField(value = "product_model_id")
+ private Long productModelId;
}
\ No newline at end of file
--
Gitblit v1.9.3