From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandardDetail.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandardDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandardDetail.java
index e2bd184..002d9f5 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandardDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyInspectionStandardDetail.java
@@ -1,11 +1,13 @@
package org.jeecg.modules.eam.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
@@ -25,7 +27,6 @@
@ApiModel(value="mom_eam_daily_inspection_standard_detail瀵硅薄", description="mom_eam_daily_inspection_standard_detail")
public class DailyInspectionStandardDetail extends JeecgEntity implements Serializable {
private static final long serialVersionUID = 1L;
-
/**鏃ュ父鐐规鏍囧噯id*/
@Excel(name = "鏃ュ父鐐规鏍囧噯id", width = 15)
@@ -94,4 +95,19 @@
@ApiModelProperty(value = "涓婃鐐规鏃堕棿")
private String lastInspectionTime;
+ @TableField(exist = false)
+ private String projectName;
+ @TableField(exist = false)
+ private String standard;
+ @TableField(exist = false)
+ @Dict(dicCode = "all_maintenance_type")
+ private String type;
+ @TableField(exist = false)
+ private String cycleName;
+ @TableField(exist = false)
+ private String equipmentId;
+ @TableField(exist = false)
+ @Dict(dicCode = "maintenance_role")
+ private String maintenanceRole;
+
}
--
Gitblit v1.9.3