From a15a0fdd42700377dfa4e2198c112210877b74c7 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期三, 24 二月 2021 19:00:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccessory.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccessory.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccessory.java
index cbf4dd1..802e8b0 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccessory.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpAccessory.java
@@ -20,14 +20,8 @@
/**
* 附件Id
*/
- @TableId(value = "accessoryId", type = IdType.AUTO)
+ @TableId(value = "accessoryId")
private Long accessoryid;
-
- /**
- * 处罚数量
- */
- @TableField("cf")
- private Integer cf;
/**
* 记录创建时间
@@ -42,17 +36,27 @@
private String creator;
/**
- * 辞职申请数量
- */
- @TableField("czsq")
- private Integer czsq;
-
- /**
* 记录删除标志。0-未删除 1-已删除，默认0
*/
@TableField("delFlag")
private Integer delFlag = 0;
/**
+ * 记录最后更新人
+ */
+ @TableField("modifier")
+ private String modifier;
+ /**
+ * 记录最后更新时间
+ */
+ @TableField("modifyTime")
+ private Date modifytime;
+
+ /**
+ * 记录版本号，用来进行乐观锁控制
+ */
+ @TableField("version")
+ private Integer version;
+ /**
* 员工Id
*/
@TableField("empId")
--
Gitblit v1.8.0