From ddae03ebb4297e78c69beab11bc8bd7e9c370913 Mon Sep 17 00:00:00 2001
From: zhongrj <123456>
Date: Wed, 24 Aug 2022 08:43:25 +0800
Subject: [PATCH] 保安公司查询修改，派遣单位字段属性修改
---
src/main/java/org/springblade/modules/permit/entity/Permit.java | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/springblade/modules/permit/entity/Permit.java b/src/main/java/org/springblade/modules/permit/entity/Permit.java
index 3e1caf2..978ffc4 100644
--- a/src/main/java/org/springblade/modules/permit/entity/Permit.java
+++ b/src/main/java/org/springblade/modules/permit/entity/Permit.java
@@ -16,23 +16,18 @@
*/
package org.springblade.modules.permit.entity;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
-
-import java.time.LocalDateTime;
-
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import org.springframework.format.annotation.DateTimeFormat;
/**
* 实体类
@@ -69,9 +64,14 @@
*/
@ApiModelProperty(value = "成立日期")
@TableField("establishTime")
- @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date establishtime;
+
+ @ApiModelProperty(value = "提交时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date permitime;
/**
* 注册资本
*/
@@ -133,11 +133,19 @@
private String type;
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+ private String deptid;
+ private String ptype;
+ private String storage;
+ private String cardid;
+ private String representativecell;
+ private String contacts;
+ private String contactscell;
+ private String approve;
+ private String jurisdiction;
- @ApiModelProperty(value = "提交时间")
- @TableField("establishTime")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Date permitime;
+ @ApiModelProperty(value = "审批时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date overtime;
}
--
Gitblit v1.9.3