From 0a70bfb2643b09628dfe42915b80ca8092dc95a2 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 19 三月 2026 16:46:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 5ef224b..c9cbaa1 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -2,6 +2,7 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.enums.AuditEnum;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductionProductMain;
import io.swagger.annotations.ApiModelProperty;
@@ -55,9 +56,12 @@
private LocalDate schedulingDate;
private String schedulingUserName;
private String customerName;
+ //宸ュ簭
+ @Excel(name = "宸ュ簭")
private String process;
private BigDecimal workHours;
private BigDecimal wages;
-
+ private Long auditUserId;
+ private String auditUserName;
}
--
Gitblit v1.9.3