From f1092d53966cf3b3b93be7fc59d913cd13d2ec37 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 16:17:47 +0800
Subject: [PATCH] 1.用户新增角色关联持证字段 2.新增接口,考试开始,修改考试的状态为考试中 3.考试查询接口修改

---
 src/main/java/org/springblade/modules/member/entity/Member.java |   30 ++++++++++++------------------
 1 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/springblade/modules/member/entity/Member.java b/src/main/java/org/springblade/modules/member/entity/Member.java
index 20339e2..25bd5ce 100644
--- a/src/main/java/org/springblade/modules/member/entity/Member.java
+++ b/src/main/java/org/springblade/modules/member/entity/Member.java
@@ -16,15 +16,18 @@
  */
 package org.springblade.modules.member.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+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;
 
 /**
  * 实体类
@@ -62,22 +65,13 @@
 		@ApiModelProperty(value = "联系电话")
 		private String cell;
 	/**
-	* 持股比例
-	*/
-		@ApiModelProperty(value = "持股比例")
-		@TableField("shareholdingRatio")
-	private String shareholdingratio;
-
-	/**
-	 * 租户ID
-	 */
-	@ApiModelProperty(value = "租户ID")
-	@TableField("tenantId")
-	private String tenantid;
-	/**
 	 * 统一社会信用代码
 	 */
 	@ApiModelProperty(value = "统一社会信用代码")
 	@TableField("creditCode")
 	private String creditcode;
+
+	@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	private Date rtime;
 }

--
Gitblit v1.9.3