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/SchemeApplicableStaff.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java b/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java
index 62346ff..acc0e62 100644
--- a/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java
+++ b/src/main/java/com/ruoyi/staff/pojo/SchemeApplicableStaff.java
@@ -10,8 +10,7 @@
import java.util.List;
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;
@@ -26,59 +25,59 @@
@Getter
@Setter
@TableName("scheme_applicable_staff")
-@ApiModel(value = "SchemeApplicableStaff瀵硅薄", description = "绀句繚鏂规閫傜敤浜哄憳琛�")
+@Schema(name = "SchemeApplicableStaff瀵硅薄", description = "绀句繚鏂规閫傜敤浜哄憳琛�")
public class SchemeApplicableStaff implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("绀句繚鏂规淇濋櫓绂忓埄鏄庣粏")
+ @Schema(description = "绀句繚鏂规淇濋櫓绂忓埄鏄庣粏")
@TableField(exist = false)
private List<SchemeInsuranceDetail> schemeInsuranceDetailList;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鏍囬")
+ @Schema(description = "鏍囬")
private String title;
- @ApiModelProperty("閮ㄩ棬ids,澶氫釜浣跨敤,闅斿紑")
+ @Schema(description = "閮ㄩ棬ids,澶氫釜浣跨敤,闅斿紑")
private String deptIds;
- @ApiModelProperty("閮ㄩ棬鍚嶇О,澶氫釜浣跨敤,闅斿紑")
+ @Schema(description = "閮ㄩ棬鍚嶇О,澶氫釜浣跨敤,闅斿紑")
@TableField(exist = false)
private String deptNames;
- @ApiModelProperty("浜哄憳鍚嶇О,澶氫釜浣跨敤,闅斿紑")
+ @Schema(description = "浜哄憳鍚嶇О,澶氫釜浣跨敤,闅斿紑")
private String staffNames;
- @ApiModelProperty("浜哄憳id,澶氫釜浣跨敤,闅斿紑")
+ @Schema(description = "浜哄憳id,澶氫釜浣跨敤,闅斿紑")
private String staffIds;
- @ApiModelProperty("淇濋櫓绫诲瀷鍚嶇О澶氫釜浣跨敤,闅斿紑")
+ @Schema(description = "淇濋櫓绫诲瀷鍚嶇О澶氫釜浣跨敤,闅斿紑")
private String insuranceTypes;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
@TableField(exist = false)
- @ApiModelProperty("鍒涘缓浜哄悕绉�")
+ @Schema(description = "鍒涘缓浜哄悕绉�")
private String createUserName;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8", shape = JsonFormat.Shape.STRING)
private LocalDateTime createTime;
- @ApiModelProperty("鏇存柊鏃堕棿")
+ @Schema(description = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
- @ApiModelProperty("鏇存柊浜�")
+ @Schema(description = "鏇存柊浜�")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
--
Gitblit v1.9.3