From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
src/main/java/com/ruoyi/staff/pojo/StaffEducation.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java b/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java
index 8f7a35e..5bfd039 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffEducation.java
@@ -10,8 +10,7 @@
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -27,53 +26,56 @@
@Getter
@Setter
@TableName("staff_education")
-@ApiModel(value = "StaffEducation瀵硅薄", description = "鍛樺伐鏁欒偛缁忓巻琛�")
+@Schema(name = "StaffEducation瀵硅薄", description = "鍛樺伐鏁欒偛缁忓巻琛�")
public class StaffEducation implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍏宠仈staff_on_job琛ㄤ富閿甀D")
+ @Schema(description = "鍏宠仈staff_on_job琛ㄤ富閿甀D")
private Long staffOnJobId;
- @ApiModelProperty("瀛﹀巻")
+ @Schema(description = "瀛﹀巻")
private String education;
- @ApiModelProperty("姣曚笟闄㈡牎")
+ @Schema(description = "姣曚笟闄㈡牎")
private String schoolName;
- @ApiModelProperty("鍏ュ鏃堕棿")
+ @Schema(description = "鍏ュ鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate enrollTime;
- @ApiModelProperty("姣曚笟鏃堕棿")
+ @Schema(description = "姣曚笟鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate graduateTime;
- @ApiModelProperty("涓撲笟")
+ @Schema(description = "涓撲笟")
private String major;
- @ApiModelProperty("瀛︿綅")
+ @Schema(description = "瀛︿綅")
private String degree;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
- @ApiModelProperty("鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Long createUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long updateUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3