From 6ad46dfcc294db8b18cfee343ce9b32c053c02bc Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 09 四月 2026 14:13:17 +0800
Subject: [PATCH] fix(staff): 解决默认密码为空时的加密问题
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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..b2f33b8 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,17 @@
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;
+
+ private Long deviceId;
+ private String deviceName;
+ private String workMinutes;
}
--
Gitblit v1.9.3