From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java | 46 +++++++++-------------------------------------
1 files changed, 9 insertions(+), 37 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 15e4fcc..77010de 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
@@ -1,31 +1,10 @@
-/*
- * Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * Neither the name of the dreamlu.net developer nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * Author: Chill 庄骞 (smallchill@163.com)
- */
package org.springblade.modules.place.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
-
import java.io.Serializable;
import java.util.Date;
@@ -80,13 +59,8 @@
@TableField("id_card")
private String idCard;
- /** 证件类型，业务字典 cardType */
- @ApiModelProperty(value = "证件类型，业务字典 cardType", example = "")
- @TableField("card_type")
- private String cardType;
-
- /** 岗位性质 */
- @ApiModelProperty(value = "岗位性质", example = "")
+ /** 岗位 */
+ @ApiModelProperty(value = "岗位", example = "")
@TableField("job_nature")
private String jobNature;
@@ -100,12 +74,6 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField(value = "create_time",fill = FieldFill.INSERT)
private Date createTime;
-
- /** 生日 */
- @ApiModelProperty(value = "生日", example = "")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @TableField("birthday")
- private Date birthday;
/** 民族 */
@ApiModelProperty(value = "民族", example = "")
@@ -135,15 +103,19 @@
/** 入职时间 */
@ApiModelProperty(value = "入职时间", example = "")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @TableField(value = "employment_time",fill = FieldFill.INSERT)
+ @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;
+ /** 是离职 1：否 2：是 */
+ @ApiModelProperty(value = "是离职 1：否 2：是", example = "")
+ @TableField("resignation_flag")
+ private Integer resignationFlag;
}
--
Gitblit v1.9.3