From a1ddf5116492be4a0e0bf597683aa01ec14977b3 Mon Sep 17 00:00:00 2001 From: 叶松 <2217086471@qq.com> Date: 星期二, 21 十一月 2023 13:47:16 +0800 Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe --- hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionRecordEntity.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionRecordEntity.java b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionRecordEntity.java index c604fda..aa3a6b5 100644 --- a/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionRecordEntity.java +++ b/hd/pipe/secure/src/main/java/com/thhy/secure/modules/biz/regionInspection/entity/RegionInspectionRecordEntity.java @@ -1,5 +1,6 @@ package com.thhy.secure.modules.biz.regionInspection.entity; +import com.thhy.general.annotations.Excel; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -24,12 +25,15 @@ private String userId;//用户id private Integer status;//0未完成 1完成 - private String statusName;//状态名称 0未完成 1完成 + @Excel(sort = 5,title = "巡检状态") + private String statusName;//状态名称 0已完成 1待巡检 private String regionHazardInformId;//区域id + @Excel(sort = 3,title = "巡检路线") private String region;//区域 private String location;//当前位置 + @Excel(sort = 1,title = "巡检时间") private Date inspectionTime;//巡检时间 private String createUser; private Date createTime; @@ -37,13 +41,15 @@ private Date updateTime; private String result;//巡检结果 //下面这些不是本表字段 + @Excel(sort = 4,title = "巡检人") private String realName; + @Excel(sort = 2,title = "任务") private String task;//任务 private String standard;//巡检标准 private String regions; private String regionIds; - private String[] imgPaths; + private String imgPaths; List<RegionInspectionRecordImgEntity> imgList; } -- Gitblit v1.9.3