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);
 
                 }