From 15ae1e3b5cda40a8248a1addf4a64c1e0a9e2b13 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 12 七月 2024 18:02:04 +0800
Subject: [PATCH] 设备管理修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificate.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificate.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificate.java
index ae73112..2231bdd 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificate.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/OperationCertificate.java
@@ -3,14 +3,14 @@
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.jeecg.common.aspect.annotation.Dict;
@@ -119,4 +119,9 @@
@Excel(name = "鎶�鑳界瓑绾�", width = 15)
@ApiModelProperty(value = "鎶�鑳界瓑绾�")
private String technicalLevel;
+
+ @ExcelCollection(name="鎿嶄綔璇佺鐞嗘槑缁�")
+ @ApiModelProperty(value = "鎿嶄綔璇佺鐞嗘槑缁�")
+ @TableField(exist = false)
+ private List<OperationCertificateDetail> operationCertificateDetailList;
}
--
Gitblit v1.9.3