From b7e12f6bfcf7d42169dffa5f169843e714833b6a Mon Sep 17 00:00:00 2001 From: luoyb <412940104@qq.com> Date: 星期五, 23 四月 2021 12:05:46 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java index 8057019..560ce45 100644 --- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java +++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java @@ -1,25 +1,25 @@ package cc.mrbird.febs.server.hr.entity; -import java.io.Serializable; -import java.util.Date; - import cc.mrbird.febs.common.core.annotation.FieldInfo; import cc.mrbird.febs.common.core.converter.TimeConverter; import cc.mrbird.febs.common.core.utils.DateDeSerializer; import cc.mrbird.febs.common.core.utils.DateSerializer; import cc.mrbird.febs.common.core.utils.DateTimeDeserializer; import cc.mrbird.febs.common.core.utils.DateTimeSerializer; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.wuwenze.poi.annotation.Excel; import com.wuwenze.poi.annotation.ExcelField; import lombok.Data; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.Version; import org.springframework.format.annotation.DateTimeFormat; +import java.io.Serializable; +import java.util.Date; + /** * name:EmpInsurance * package:cc.mrbird.febs.server.hr.controller -- Gitblit v1.8.0