From c354b62e324e63691418974d5f88b916e8a35f0a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 07 七月 2025 15:37:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java | 47 ++++++++++++-----------------------------------
1 files changed, 12 insertions(+), 35 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
index 863aa72..5f8f044 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamInspectionOrder.java
@@ -8,6 +8,7 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -25,35 +26,9 @@
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="eam_inspection_order瀵硅薄", description="鐐规宸ュ崟")
-public class EamInspectionOrder implements Serializable {
+public class EamInspectionOrder extends JeecgEntity implements Serializable {
private static final long serialVersionUID = 1L;
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭")
- private String id;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern="yyyy-MM-dd")
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- @TableLogic
- private Integer delFlag;
/**宸ュ崟鍙�*/
@Excel(name = "宸ュ崟鍙�", width = 15)
@ApiModelProperty(value = "宸ュ崟鍙�")
@@ -122,22 +97,24 @@
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞-鐐规宸ュ崟鍒涘缓澶囨敞")
private String remark;
- /**鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧*/
- @Excel(name = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧-鎵ц鏃�", width = 15)
- @ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧")
- private String imageFiles;
/**鏍囧噯鍚嶇О*/
@ApiModelProperty(value = "鏍囧噯鍚嶇О")
private transient String standardName;
- /**淇濆吇鍛ㄦ湡;鍗曚綅:澶�*/
- @ApiModelProperty(value = "淇濆吇鍛ㄦ湡;鍗曚綅:澶�")
- private transient Integer maintenancePeriod;
- /**璁惧缂栧彿*/
@ApiModelProperty(value = "璁惧缂栧彿")
private transient String equipmentCode;
+
+ /**鍒犻櫎鏍囪*/
+ @Excel(name = "鍒犻櫎鏍囪", width = 15)
+ @ApiModelProperty(value = "鍒犻櫎鏍囪")
+ @TableLogic
+ private Integer delFlag;
@ApiModelProperty(value = "璁惧鍚嶇О")
@TableField(exist = false)
private String equipmentName;
+
+ @ApiModelProperty(value = "璁惧鍨嬪彿")
+ @TableField(exist = false)
+ private String equipmentModel;
}
--
Gitblit v1.9.3