From 6f2587611c32bd21294367c96efdee9e6785de04 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 2 Jun 2025 16:25:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E4=B8=8A=E4=BC=A0=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/material/device/domain/vo/DevTemplateVo.java | 6 ++++++ .../material/device/service/impl/DevInfoServiceImpl.java | 2 ++ 2 files changed, 8 insertions(+) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevTemplateVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevTemplateVo.java index a570324..10cacd6 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevTemplateVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevTemplateVo.java @@ -55,6 +55,12 @@ public class DevTemplateVo { @ApiModelProperty(value = "上架数量") private Integer deviceCount; + @ApiModelProperty(value = "上传人") + private String uploadUser; + + @ApiModelProperty(value = "上传时间") + private String uploadTime; + @Excel(name = "唯一标识符") @ApiModelProperty(value = "设备唯一标识符") private String identifyCode; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java index ac15248..9b9c8ee 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java @@ -1000,6 +1000,8 @@ public class DevInfoServiceImpl implements DevInfoService { if (!CollectionUtils.isEmpty(dtoList)) { devTemplateVo.setTableList(dtoList); } + devTemplateVo.setUploadUser(SecurityUtils.getLoginUser().getSysUser().getUserName()); + devTemplateVo.setUploadTime(DateUtils.dateTime()); templateVos.add(devTemplateVo); }