From 1614615fc9319b8626eb028598b894311992c033 Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: Mon, 25 Sep 2023 15:19:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/WorkRegistrationAddForm.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/WorkRegistrationAddForm.java b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/WorkRegistrationAddForm.java
index 648cc3d..248086e 100644
--- a/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/WorkRegistrationAddForm.java
+++ b/exam-system/src/main/java/com/gkhy/exam/noncoalmine/model/addForm/WorkRegistrationAddForm.java
@@ -1,10 +1,10 @@
package com.gkhy.exam.noncoalmine.model.addForm;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Date;
@@ -15,33 +15,42 @@
* @date: 2023/9/11
* @time: 17:09
*/
+@ApiModel(value = "作业登记实体")
@Data
public class WorkRegistrationAddForm {
-
//姓名
+ @ApiModelProperty(value = "姓名",required = true)
@NotEmpty(message = "请填写姓名")
private String name;
//身份证
+ @ApiModelProperty(value = "身份证",required = true)
@NotEmpty(message = "请填写身份证")
private String idCard;
//电子证号
+ @ApiModelProperty(value = "电子证号")
private String electNum;
//IC卡编号
+ @ApiModelProperty(value = "IC卡编号")
private String icNum;
//作业时间
+ @ApiModelProperty(value = "作业时间",required = true)
@NotNull(message = "请填写做业时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date workTime;
//所属单位
+ @ApiModelProperty(value = "所属单位")
@NotEmpty(message = "请填写所属单位")
private String dept;
//操作类型id
+ @ApiModelProperty(value = "操作类型id",required = true)
@NotNull(message = "请选择操作类型")
private Long operateTypeId;
//是否为煤矿：0为非，1是
+ @ApiModelProperty(value = "是否为煤矿",required = true,notes = "0为非，1是")
@NotNull(message = "是否为煤矿不可为空")
- private Integer isCm;
+ private Byte isCm;
//描述
+ @ApiModelProperty(value = "描述")
private String remark;
}
--
Gitblit v1.9.2