From 58f63d0e061123b15f780d294272d8a461f183db Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期三, 23 七月 2025 17:41:59 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportThreeNoSpare.java | 94 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 94 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportThreeNoSpare.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportThreeNoSpare.java new file mode 100644 index 0000000..6f80781 --- /dev/null +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamReportThreeNoSpare.java @@ -0,0 +1,94 @@ +package org.jeecg.modules.eam.entity; + +import java.io.Serializable; +import java.io.UnsupportedEncodingException; +import java.util.Date; +import java.math.BigDecimal; +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 lombok.Data; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.jeecg.common.aspect.annotation.Dict; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + * @Description: 鈥滀笁涓嶆斁杩囩殑鍘熷垯鈥濆垎鏋愯〃 + * @Author: jeecg-boot + * @Date: 2025-07-17 + * @Version: V1.0 + */ +@Data +@TableName("eam_report_three_no_spare") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="eam_report_three_no_spare瀵硅薄", description="鈥滀笁涓嶆斁杩囩殑鍘熷垯鈥濆垎鏋愯〃") +public class EamReportThreeNoSpare implements Serializable { + private static final long serialVersionUID = 1L; + + /**涓婚敭*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "涓婚敭") + private String id; + /**鍒涘缓浜�*/ + @ApiModelProperty(value = "鍒涘缓浜�") + private String createBy; + /**鍒涘缓鏃ユ湡*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鍒涘缓鏃ユ湡") + private Date createTime; + /**鏇存柊浜�*/ + @ApiModelProperty(value = "鏇存柊浜�") + private String updateBy; + /**鏇存柊鏃ユ湡*/ + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "鏇存柊鏃ユ湡") + private Date updateTime; + /**鍒犻櫎鏍囪*/ + @Excel(name = "鍒犻櫎鏍囪", width = 15) + @ApiModelProperty(value = "鍒犻櫎鏍囪") + @TableLogic + private String delFlag; + /**鎶ヤ慨ID*/ + @Excel(name = "鎶ヤ慨ID", width = 15) + @ApiModelProperty(value = "鎶ヤ慨ID") + private String reportId; + /**璁惧ID*/ + @Excel(name = "璁惧ID", width = 15) + @ApiModelProperty(value = "璁惧ID") + private String equipmentId; + /**鍘熷洜鍒嗘瀽*/ + @Excel(name = "鍘熷洜鍒嗘瀽", width = 15) + @ApiModelProperty(value = "鍘熷洜鍒嗘瀽") + private String causeAnalysis; + /**鍩硅鏁欒偛鏄� 鍚�*/ + @Excel(name = "鍩硅鏁欒偛鏄� 鍚�", width = 15) + @ApiModelProperty(value = "鍩硅鏁欒偛鏄� 鍚�") + private String isTrainingEducation; + /**鍩硅褰㈠紡*/ + @Excel(name = "鍩硅褰㈠紡", width = 15) + @ApiModelProperty(value = "鍩硅褰㈠紡") + private String trainingFormat; + /**鍩硅鍐呭*/ + @Excel(name = "鍩硅鍐呭", width = 15) + @ApiModelProperty(value = "鍩硅鍐呭") + private String trainingContent; + /**鍩硅浜�*/ + @Excel(name = "鍩硅浜�", width = 15) + @ApiModelProperty(value = "鍩硅浜�") + private String trainingUser; + /**鍩硅鏃堕棿*/ + @Excel(name = "鍩硅鏃堕棿", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "鍩硅鏃堕棿") + private Date trainingUserTime; +} -- Gitblit v1.9.3