From cfa829af899676b1464eccac65b11084aa2a8508 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 20 Dec 2023 16:39:21 +0800
Subject: [PATCH] 实时位置
---
src/main/java/org/springblade/modules/leave/entity/Leave.java | 91 +++++++++++++++------------------------------
1 files changed, 30 insertions(+), 61 deletions(-)
diff --git a/src/main/java/org/springblade/modules/leave/entity/Leave.java b/src/main/java/org/springblade/modules/leave/entity/Leave.java
index 136ae46..4a0c6d0 100644
--- a/src/main/java/org/springblade/modules/leave/entity/Leave.java
+++ b/src/main/java/org/springblade/modules/leave/entity/Leave.java
@@ -1,84 +1,53 @@
package org.springblade.modules.leave.entity;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
-import java.io.Serializable;
import java.util.Date;
-/**
- * 请假实体类
- *
- * @author zhongrj
- * @since 2020-02-28
- */
@Data
@TableName("sys_leave")
-public class Leave implements Serializable {
+public class Leave extends BaseEntity {
- private static final long serialVersionUID = 1L;
+ //请假原因
+ private String reason;
- /**
- * 主键id
- */
- @TableId(value = "id",type = IdType.AUTO)
- private Long id;
-
- /**
- * 用户id
- */
- private Long userId;
-
- /**
- * 请假类型
- */
- private Integer leaveType;
-
- /**
- * 请假原因
- */
- private String leaveReason;
-
- /**
- * 请假开始时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
private Date startTime;
- /**
- * 请假截止时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
private Date endTime;
- /**
- * 创建时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ @DateTimeFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss"
+ )
+ private Date auditTime;
- /**
- * 审核状态 1：通过 2：不通过 3：待审核
- */
- private Integer auditStatus;
+ private String urls;
- /**
- * 审核明细
- */
+ //审核状态（1、通过；2不通过；10待审核）
+ private String auditStatus;
+
+ //审核明细
private String auditDetail;
- /**
- * 审核时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date auditTime;
+ //审核人
+ private String auditUser;
}
--
Gitblit v1.9.3