From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java b/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
index 2fea048..bc28ded 100644
--- a/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
+++ b/src/main/java/com/ruoyi/compensationperformance/pojo/CompensationPerformance.java
@@ -3,8 +3,7 @@
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -21,25 +20,25 @@
*/
@Data
@TableName("compensation_performance")
-@ApiModel("钖叕缁╂晥鏄庣粏")
+@Schema(name = "钖叕缁╂晥鏄庣粏")
public class CompensationPerformance implements Serializable {
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.AUTO)
- @ApiModelProperty("涓婚敭")
+ @Schema(description = "涓婚敭")
private Long id;
/**
* 鍛樺伐id
*/
- @ApiModelProperty("鍛樺伐id")
+ @Schema(description = "鍛樺伐id")
private Long staffId;
/**
* 鍛樺伐濮撳悕
*/
- @ApiModelProperty("鍛樺伐濮撳悕")
+ @Schema(description = "鍛樺伐濮撳悕")
@Excel(name = "鍛樺伐濮撳悕")
@TableField(exist = false)
private String staffName;
@@ -47,7 +46,7 @@
/**
* 宀椾綅鍚嶇О
*/
- @ApiModelProperty("宀椾綅鍚嶇О")
+ @Schema(description = "宀椾綅鍚嶇О")
@Excel(name = "宀椾綅鍚嶇О")
@TableField(exist = false)
private String postName;
@@ -55,7 +54,7 @@
/**
* 閮ㄩ棬鍚嶇О
*/
- @ApiModelProperty("閮ㄩ棬鍚嶇О")
+ @Schema(description = "閮ㄩ棬鍚嶇О")
@Excel(name = "閮ㄩ棬鍚嶇О")
@TableField(exist = false)
private String deptName;
@@ -63,7 +62,7 @@
/**
* 钖祫鏈堜唤
*/
- @ApiModelProperty("钖祫鏈堜唤")
+ @Schema(description = "钖祫鏈堜唤")
@Excel(name = "鏈堜唤", dateFormat = "yyyy-MM", width = 20)
@JsonFormat(pattern = "yyyy-MM", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM")
@@ -72,84 +71,84 @@
/**
* 鍩烘湰宸ヨ祫
*/
- @ApiModelProperty("鍩烘湰宸ヨ祫")
+ @Schema(description = "鍩烘湰宸ヨ祫")
@Excel(name = "鍩烘湰宸ヨ祫")
private BigDecimal basicSalary;
/**
* 璁′欢宸ヨ祫
*/
- @ApiModelProperty("璁′欢宸ヨ祫")
+ @Schema(description = "璁′欢宸ヨ祫")
@Excel(name = "璁′欢宸ヨ祫")
private BigDecimal pieceworkSalary;
/**
* 璁℃椂宸ヨ祫
*/
- @ApiModelProperty("璁℃椂宸ヨ祫")
+ @Schema(description = "璁℃椂宸ヨ祫")
@Excel(name = "璁℃椂宸ヨ祫")
private BigDecimal hourlySalary;
/**
* 鍏朵粬鏀跺叆
*/
- @ApiModelProperty("鍏朵粬鏀跺叆")
+ @Schema(description = "鍏朵粬鏀跺叆")
@Excel(name = "鍏朵粬鏀跺叆")
private BigDecimal otherIncome;
/**
* 绀句繚涓汉
*/
- @ApiModelProperty("绀句繚涓汉")
+ @Schema(description = "绀句繚涓汉")
@Excel(name = "绀句繚涓汉")
private BigDecimal socialSecurityIndividuals;
/**
* 鍏Н閲戜釜浜�
*/
- @ApiModelProperty("鍏Н閲戜釜浜�")
+ @Schema(description = "鍏Н閲戜釜浜�")
@Excel(name = "鍏Н閲戜釜浜�")
private BigDecimal providentFundIndividuals;
/**
* 宸ヨ祫涓◣
*/
- @ApiModelProperty("宸ヨ祫涓◣")
+ @Schema(description = "宸ヨ祫涓◣")
@Excel(name = "宸ヨ祫涓◣")
private BigDecimal personalIncomeTax;
/**
* 鍏朵粬鏀嚭
*/
- @ApiModelProperty("鍏朵粬鏀嚭")
+ @Schema(description = "鍏朵粬鏀嚭")
@Excel(name = "鍏朵粬鏀嚭")
private BigDecimal otherDeductions;
/**
* 搴斿彂宸ヨ祫
*/
- @ApiModelProperty("搴斿彂宸ヨ祫")
+ @Schema(description = "搴斿彂宸ヨ祫")
@Excel(name = "搴斿彂宸ヨ祫")
private BigDecimal payableWages;
/**
* 搴旀墸宸ヨ祫
*/
- @ApiModelProperty("搴旀墸宸ヨ祫")
+ @Schema(description = "搴旀墸宸ヨ祫")
@Excel(name = "搴旀墸宸ヨ祫")
private BigDecimal deductibleWages;
/**
* 瀹炲彂宸ヨ祫
*/
- @ApiModelProperty("瀹炲彂宸ヨ祫")
+ @Schema(description = "瀹炲彂宸ヨ祫")
@Excel(name = "瀹炲彂宸ヨ祫")
private BigDecimal actualWages;
/**
* 澶囨敞
*/
- @ApiModelProperty("澶囨敞")
+ @Schema(description = "澶囨敞")
@Excel(name = "澶囨敞")
private String remark;
--
Gitblit v1.9.3