From 93000441daeeabce0696bb32c5335e10740916d6 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 12 Jul 2021 09:23:17 +0800
Subject: [PATCH] 1.

---
 src/main/java/org/springblade/modules/performance/entity/Performance.java |   64 +++++++++++++++----------------
 1 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/main/java/org/springblade/modules/performance/entity/Performance.java b/src/main/java/org/springblade/modules/performance/entity/Performance.java
index 3e52ea7..35893a9 100644
--- a/src/main/java/org/springblade/modules/performance/entity/Performance.java
+++ b/src/main/java/org/springblade/modules/performance/entity/Performance.java
@@ -19,13 +19,20 @@
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.time.LocalDateTime;
+
 import com.baomidou.mybatisplus.annotation.TableField;
+
 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;
 
 /**
  * 实体类
@@ -43,46 +50,37 @@
 	@TableId(value = "id", type = IdType.AUTO)
 	private Integer id;
 	/**
-	* 保安人编码
-	*/
-		@ApiModelProperty(value = "保安人编码")
-		@TableField("securityId")
+	 * 保安人编码
+	 */
+	@ApiModelProperty(value = "保安人编码")
+	@TableField("securityId")
 	private String securityid;
 	/**
-	* 工作态度
-	*/
-		@ApiModelProperty(value = "工作态度")
-		@TableField("workingAttitude")
+	 * 工作态度
+	 */
+	@ApiModelProperty(value = "工作态度")
+	@TableField("workingAttitude")
 	private String workingattitude;
+
 	/**
-	* 工作能力
-	*/
-		@ApiModelProperty(value = "工作能力")
-		@TableField("workingAbility")
-	private String workingability;
-	/**
-	* 工作成效
-	*/
-		@ApiModelProperty(value = "工作成效")
-		@TableField("Achievements")
+	 * 工作成效
+	 */
+	@ApiModelProperty(value = "工作成效")
+	@TableField("Achievements")
 	private String achievements;
 	/**
-	* 评分
-	*/
-		@ApiModelProperty(value = "评分")
-		private String score;
+	 * 评分
+	 */
+	@ApiModelProperty(value = "评分")
+	private String score;
 	/**
-	* 时间
-	*/
-		@ApiModelProperty(value = "时间")
-		private String time;
-	/**
-	* 租户ID
-	*/
-		@ApiModelProperty(value = "租户ID")
-		@TableField("tenantId")
-	private String tenantid;
-	private String company;
+	 * 时间
+	 */
+	@ApiModelProperty(value = "时间")
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date time;
+	private String departmentid;
 
 
 }

--
Gitblit v1.9.3