From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro
---
src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
index 1ab10ab..6cbe396 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
@@ -8,8 +8,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -24,79 +23,82 @@
@Getter
@Setter
@TableName("staff_salary_detail")
-@ApiModel(value = "StaffSalaryDetail瀵硅薄", description = "鍛樺伐宸ヨ祫鏄庣粏琛�")
+@Schema(name = "StaffSalaryDetail瀵硅薄", description = "鍛樺伐宸ヨ祫鏄庣粏琛�")
public class StaffSalaryDetail implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("涓婚敭ID")
+ @Schema(description = "涓婚敭ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("鍏宠仈宸ヨ祫涓昏〃ID")
+ @Schema(description = "鍏宠仈宸ヨ祫涓昏〃ID")
private Long mainId;
- @ApiModelProperty("鍏宠仈staff_on_job琛ㄤ富閿甀D")
+ @Schema(description = "鍏宠仈staff_on_job琛ㄤ富閿甀D")
private Long staffOnJobId;
- @ApiModelProperty("鍛樺伐濮撳悕")
+ @Schema(description = "鍛樺伐濮撳悕")
private String staffName;
- @ApiModelProperty("鑱屼綅鍚嶇О")
+ @Schema(description = "鑱屼綅鍚嶇О")
private String postName;
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Schema(description = "閮ㄩ棬鍚嶇О")
private String deptName;
- @ApiModelProperty("鍩烘湰宸ヨ祫")
+ @Schema(description = "鍩烘湰宸ヨ祫")
private BigDecimal basicSalary;
- @ApiModelProperty("璁′欢宸ヨ祫")
+ @Schema(description = "璁′欢宸ヨ祫")
private BigDecimal pieceSalary;
- @ApiModelProperty("璁℃椂宸ヨ祫")
+ @Schema(description = "璁℃椂宸ヨ祫")
private BigDecimal hourlySalary;
- @ApiModelProperty("鍏朵粬鏀跺叆")
+ @Schema(description = "鍏朵粬鏀跺叆")
private BigDecimal otherIncome;
- @ApiModelProperty("绀句繚涓汉")
+ @Schema(description = "绀句繚涓汉")
private BigDecimal socialPersonal;
- @ApiModelProperty("鍏Н閲戜釜浜�")
+ @Schema(description = "鍏Н閲戜釜浜�")
private BigDecimal fundPersonal;
- @ApiModelProperty("鍏朵粬鏀嚭")
+ @Schema(description = "鍏朵粬鏀嚭")
private BigDecimal otherDeduct;
- @ApiModelProperty("宸ヨ祫涓◣")
+ @Schema(description = "宸ヨ祫涓◣")
private BigDecimal salaryTax;
- @ApiModelProperty("搴斿彂宸ヨ祫")
+ @Schema(description = "搴斿彂宸ヨ祫")
private BigDecimal grossSalary;
- @ApiModelProperty("搴旀墸宸ヨ祫")
+ @Schema(description = "搴旀墸宸ヨ祫")
private BigDecimal deductSalary;
- @ApiModelProperty("瀹炲彂宸ヨ祫")
+ @Schema(description = "瀹炲彂宸ヨ祫")
private BigDecimal netSalary;
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
private String remark;
- @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