From 111a401f033749c965f02f58c586a8feafd9afd1 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 27 十一月 2023 11:23:46 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/service/impl/TSteelProduceServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/service/impl/TSteelProduceServiceImpl.java b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/service/impl/TSteelProduceServiceImpl.java
index fed3638..23e4dbd 100644
--- a/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/service/impl/TSteelProduceServiceImpl.java
+++ b/hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/rebarprint/service/impl/TSteelProduceServiceImpl.java
@@ -238,7 +238,7 @@
}else {
exportDto.setQualityTime(produceDto.getQualityTime().toString());
}
- exportDto.setRealName(produceDto.getRealName());
+ exportDto.setPlatUserName(produceDto.getPlatUserName());
exportDto.setQualityUserName(produceDto.getQualityUserName());
if(produceDto.getIsQualified()!=null && produceDto.getIsQualified()==1){
@@ -263,7 +263,7 @@
excel.addHeaderAlias("blockName", "块号");
excel.addHeaderAlias("groupName", "生产班组");
excel.addHeaderAlias("printTime", "打印时间");
- excel.addHeaderAlias("realName", "制作人");
+ excel.addHeaderAlias("platUserName", "制作人");
excel.addHeaderAlias("qualityUserName", "质检人");
excel.addHeaderAlias("qualityTime", "质检时间");
excel.addHeaderAlias("isQualified", "是否合格");
--
Gitblit v1.9.3