From f29e2aae98bbb52672b67bff99556f3cf64d1bce Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期四, 26 六月 2025 15:45:40 +0800 Subject: [PATCH] feat(eims): 优化设备管理功能和界面 --- eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsRepairResVo.java | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsRepairResVo.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsRepairResVo.java index 397e720..054655c 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsRepairResVo.java +++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/domain/vo/EimsRepairResVo.java @@ -2,6 +2,7 @@ import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; import org.dromara.eims.domain.EimsRepairRes; @@ -15,7 +16,7 @@ import java.io.Serial; import java.io.Serializable; import java.util.Date; - +import java.util.List; /** @@ -27,7 +28,7 @@ @Data @ExcelIgnoreUnannotated @AutoMapper(target = EimsRepairRes.class) -public class EimsRepairResVo implements Serializable { +public class EimsRepairResVo extends BaseEntity implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -128,12 +129,18 @@ @ExcelProperty(value = "澶囨敞") private String remark; + /** + * 璇勪环id + */ + private Long fbId; + // 鍏宠仈琛ㄥ瓧娈� private String reqType;//鎶ヤ慨绫诲瀷 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date reqTime;//鎶ヤ慨鏃堕棿 private String equName;//璁惧鍚嶇О + private String assetNo;// private String fixtureName;//宸ュ叿鍚嶇О private String faultType;//鏁呴殰绫诲埆 private String reqDeptName;//鎶ヤ慨閮ㄩ棬 @@ -142,5 +149,7 @@ @Translation(type = TransConstant.REPAIR_REQ_ID_TO_CODE, mapper = "reqId") private String reqCode;//鎶ヤ慨缂栫爜 + private List<EimsSpareVo> spareParts; + } -- Gitblit v1.9.3