From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java |  109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 109 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
new file mode 100644
index 0000000..bf2d75d
--- /dev/null
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
@@ -0,0 +1,109 @@
+package org.jeecg.modules.mdc.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.system.base.entity.JeecgEntity;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description: 璁惧鍔犵彮绠$悊
+ * @Author: Lius
+ * @Date: 2023-08-25
+ * @Version: V1.0
+ */
+@Data
+@TableName("mdc_equipment_overtime")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "mdc_equipment_overtime瀵硅薄", description = "璁惧鍔犵彮绠$悊")
+public class MdcEquipmentOvertime extends JeecgEntity implements Serializable {
+
+    private static final long serialVersionUID = -7163039765166584824L;
+
+    @TableField(exist = false)
+    @Excel(name = "璁惧缂栧彿", width = 20)
+    private String equipmentId;
+
+    @TableField(exist = false)
+    @Excel(name = "璁惧鍚嶇О", width = 20)
+    private String equipmentName;
+
+    /**
+     * 鐢熸晥鏃ユ湡
+     */
+    @Excel(name = "鐢熸晥鏃ユ湡", width = 15)
+    @TableField(exist = false)
+    private String effectiveDate;
+
+    /**
+     * 鐝寮�濮嬫椂闂�
+     */
+    @Excel(name = "鐝寮�濮嬫椂闂�", width = 20)
+    @ApiModelProperty("鐝寮�濮嬫椂闂�")
+    @TableField(exist = false)
+    private String startDate;
+
+    /**
+     * 鐝缁撴潫鏃堕棿
+     */
+    @Excel(name = "鐝缁撴潫鏃堕棿", width = 20)
+    @ApiModelProperty("鐝缁撴潫鏃堕棿")
+    @TableField(exist = false)
+    private String endDate;
+
+    /**
+     * 宸ヤ綔鏃ュ巻id
+     */
+    @ApiModelProperty(value = "宸ヤ綔鏃ュ巻id")
+    private String calendarId;
+
+    /**
+     * 鍔犵彮寮�濮嬫椂闂�
+     */
+    @Excel(name = "鍔犵彮寮�濮嬫椂闂�", width = 20)
+    @ApiModelProperty(value = "鍔犵彮寮�濮嬫椂闂�")
+    private String startTime;
+    /**
+     * 鍔犵彮缁撴潫鏃堕棿
+     */
+    @Excel(name = "鍔犵彮缁撴潫鏃堕棿", width = 20)
+    @ApiModelProperty(value = "鍔犵彮缁撴潫鏃堕棿")
+    private String endTime;
+
+    /**
+     * 澶囨敞
+     */
+    @Excel(name = "澶囨敞")
+    @ApiModelProperty(value = "澶囨敞")
+    private String remark;
+
+    /**
+     * 鍓嶅彴浼犲叆 鍒ゆ柇姣忎釜id
+     */
+    @TableField(exist = false)
+    private String parentId;
+
+    /**
+     * 鍓嶅彴浼犲叆 杞﹂棿灞傜骇:1 閮ㄩ棬灞傜骇:2
+     */
+    @TableField(exist = false)
+    private String typeTree;
+
+    /**
+     * 閮ㄩ棬parentId 鍏宠仈瀛愰泦id
+     */
+    @TableField(exist = false)
+    private List<String> mdcSectionIds;
+
+    @TableField(exist = false)
+    private String equipmentIds;
+
+}

--
Gitblit v1.9.3