From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java b/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
index cd03bd5..036c093 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
@@ -103,13 +103,13 @@
/** 入职时间 */
@ApiModelProperty(value = "入职时间", example = "")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField(value = "employment_time")
private Date employmentTime;
/** 离职时间 */
@ApiModelProperty(value = "离职时间", example = "")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("resignation_time")
private Date resignationTime;
@@ -118,4 +118,25 @@
@TableField("resignation_flag")
private Integer resignationFlag;
+ /** 审核确认人用户id */
+ @ApiModelProperty(value = "审核确认人用户id", example = "")
+ @TableField("confirm_user_id")
+ private Long confirmUserId;
+
+ /** 确认标记 1：待审核 2：审核通过 3：审核不通过 4:待完善 */
+ @ApiModelProperty(value = "确认标记 1：待审核 2：审核通过 3：审核不通过 4:待完善", example = "")
+ @TableField("confirm_flag")
+ private Integer confirmFlag;
+
+ /** 审核确认时间 */
+ @ApiModelProperty(value = "审核确认时间", example = "")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("confirm_time")
+ private Date confirmTime;
+
+ /** 审核意见 */
+ @ApiModelProperty(value = "审核意见", example = "")
+ @TableField("confirm_notion")
+ private String confirmNotion;
+
}
--
Gitblit v1.9.3