From 8ca64d03d58db959d95f49119be0cb322d6edf2f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Jul 2021 17:25:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/apply/entity/Apply.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/entity/Apply.java b/src/main/java/org/springblade/modules/apply/entity/Apply.java
index f9c3ce6..e28bfb0 100644
--- a/src/main/java/org/springblade/modules/apply/entity/Apply.java
+++ b/src/main/java/org/springblade/modules/apply/entity/Apply.java
@@ -21,10 +21,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.springblade.core.tenant.mp.TenantEntity;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -158,7 +155,19 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date examTime;
+ /**
+ * 审核状态
+ */
private String examinationType;
+ /**
+ * 审核明细
+ */
private String examinationMx;
+
+ /**
+ * 报名编号
+ */
+ @TableField("apply_code")
+ private String applyCode;
}
--
Gitblit v1.9.3