From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
index 2b7a20d..f02eed1 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductMain.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,6 +17,7 @@
private Long id;
@ApiModelProperty(value = "鎶ュ伐鍗曞彿")
+ @Excel(name = "鎶ュ伐鍗曞彿")
private String productNo;
@ApiModelProperty(value = "鎶ュ伐浜哄憳id")
@@ -30,6 +32,9 @@
@ApiModelProperty(value = "宸ュ崟id")
private Long workOrderId;
+ @ApiModelProperty(value = "鐢熶骇璁㈠崟id")
+ private Long productOrderId;
+
@ApiModelProperty(value = "鎶ュ伐鐘舵��")
private Integer status;
@@ -37,6 +42,7 @@
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍒涘缓鏃堕棿")
private LocalDateTime createTime;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
--
Gitblit v1.9.3