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/StaffSalaryMain.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java
index 191406b..c85c61c 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryMain.java
@@ -11,8 +11,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;
@@ -27,7 +26,7 @@
@Getter
@Setter
@TableName("staff_salary_main")
-@ApiModel(value = "StaffSalaryMain瀵硅薄", description = "鍛樺伐宸ヨ祫涓昏〃")
+@Schema(name = "StaffSalaryMain瀵硅薄", description = "鍛樺伐宸ヨ祫涓昏〃")
public class StaffSalaryMain implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,59 +34,62 @@
@TableField(exist = false)
private List<StaffSalaryDetail> staffSalaryDetailList;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("瀹℃牳浜篒d")
+ @Schema(description = "瀹℃牳浜篒d")
private Long auditUserId;
- @ApiModelProperty("瀹℃牳浜哄悕绉�")
+ @Schema(description = "瀹℃牳浜哄悕绉�")
private String auditUserName;
- @ApiModelProperty("宸ヨ祫涓婚")
+ @Schema(description = "宸ヨ祫涓婚")
private String salaryTitle;
- @ApiModelProperty("鍏宠仈閮ㄩ棬ID锛屽涓敤閫楀彿鍒嗛殧")
+ @Schema(description = "鍏宠仈閮ㄩ棬ID锛屽涓敤閫楀彿鍒嗛殧")
private String deptIds;
- @ApiModelProperty("宸ヨ祫鏈堜唤锛屾牸寮忥細yyyy-MM")
+ @Schema(description = "宸ヨ祫鏈堜唤锛屾牸寮忥細yyyy-MM")
private String salaryMonth;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @ApiModelProperty("鐘舵�侊細1-鑽夌 2-瀹℃牳鏈�氳繃 3-寰呭鏍� 4-寰呭彂鏀� 5-宸插彂鏀�")
+ @Schema(description = "鐘舵�侊細1-鑽夌 2-瀹℃牳鏈�氳繃 3-寰呭鏍� 4-寰呭彂鏀� 5-宸插彂鏀�")
private Integer status;
- @ApiModelProperty("宸ヨ祫鎬婚")
+ @Schema(description = "宸ヨ祫鎬婚")
private BigDecimal totalSalary;
- @ApiModelProperty("鏀粯閾惰")
+ @Schema(description = "鏀粯閾惰")
private String payBank;
@TableField(exist = false)
- @ApiModelProperty("鍒涘缓浜�")
+ @Schema(description = "鍒涘缓浜�")
private String createUserName;
- @ApiModelProperty("鍙戞斁鏃堕棿")
+ @Schema(description = "鍙戞斁鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8",shape = JsonFormat.Shape.STRING)
private LocalDateTime payTime;
- @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)
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