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/StaffOnJob.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index 8cddc3e..bff864a 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -4,7 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -185,64 +185,64 @@
private String remark;
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty(value = "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty(value = "淇敼鐢ㄦ埛")
+ @Schema(description = "淇敼鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ApiModelProperty(value = "绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "鍒悕")
+ @Schema(description = "鍒悕")
private String alias;
- @ApiModelProperty(value = "鍑虹敓鏃ユ湡")
+ @Schema(description = "鍑虹敓鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date birthDate;
- @ApiModelProperty(value = "姘戞棌")
+ @Schema(description = "姘戞棌")
private String nation;
- @ApiModelProperty(value = "濠氬Щ鐘跺喌")
+ @Schema(description = "濠氬Щ鐘跺喌")
private String maritalStatus;
- @ApiModelProperty(value = "璇曠敤鏈燂紙鏈堬級")
+ @Schema(description = "璇曠敤鏈燂紙鏈堬級")
private Integer proTerm;
- @ApiModelProperty(value = "杞鏃ユ湡")
+ @Schema(description = "杞鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date positiveDate;
- @ApiModelProperty(value = "鍩烘湰宸ヨ祫")
+ @Schema(description = "鍩烘湰宸ヨ祫")
private BigDecimal basicSalary;
- @ApiModelProperty(value = "鍛樺伐鏁欒偛缁忓巻闆嗗悎")
+ @Schema(description = "鍛樺伐鏁欒偛缁忓巻闆嗗悎")
@TableField(exist = false)
private List<StaffEducation> staffEducationList;
- @ApiModelProperty(value = "鍛樺伐宸ヤ綔缁忓巻闆嗗悎")
+ @Schema(description = "鍛樺伐宸ヤ綔缁忓巻闆嗗悎")
@TableField(exist = false)
private List<StaffWorkExperience> staffWorkExperienceList;
- @ApiModelProperty(value = "鍛樺伐绱ф�ヨ仈绯讳汉闆嗗悎")
+ @Schema(description = "鍛樺伐绱ф�ヨ仈绯讳汉闆嗗悎")
@TableField(exist = false)
private List<StaffEmergencyContact> staffEmergencyContactList;
--
Gitblit v1.9.3