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/device/pojo/DeviceLedger.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
index f8c9e53..61239ac 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
@@ -4,8 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
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.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,7 +17,7 @@
*/
@Data
@TableName("device_ledger")
-@ApiModel
+@Schema
public class DeviceLedger {
/**
@@ -30,25 +29,25 @@
/**
* 璁惧鍚嶇О
*/
- @ApiModelProperty("璁惧鍚嶇О")
+ @Schema(description = "璁惧鍚嶇О")
private String deviceName;
/**
* 瑙勬牸鍨嬪彿
*/
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String deviceModel;
/**
* 璁惧鍝佺墝
*/
- @ApiModelProperty("璁惧鍝佺墝")
+ @Schema(description = "璁惧鍝佺墝")
private String deviceBrand;
/**
* 瀛樻斁浣嶇疆
*/
- @ApiModelProperty("瀛樻斁浣嶇疆")
+ @Schema(description = "瀛樻斁浣嶇疆")
private String storageLocation;
/**
@@ -122,41 +121,44 @@
/* *************************** 杩愯绠＄悊 *************************** */
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
private String status;
- @ApiModelProperty("璁″垝杩愯鏃堕棿")
+ @Schema(description = "璁″垝杩愯鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planRuntimeTime;
- @ApiModelProperty("寮�濮嬭繍琛屾椂闂�")
+ @Schema(description = "寮�濮嬭繍琛屾椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startRuntimeTime;
- @ApiModelProperty("缁撴潫杩愯鏃堕棿")
+ @Schema(description = "缁撴潫杩愯鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endRuntimeTime;
- @ApiModelProperty("杩愯鏃堕暱")
+ @Schema(description = "杩愯鏃堕暱")
private String runtimeDuration;
- @ApiModelProperty("鏄惁鎶樻棫 1-鏄� 2-鍚�")
+ @Schema(description = "鏄惁鎶樻棫 1-鏄� 2-鍚�")
private Integer isDepr;
- @ApiModelProperty("姣忓勾鎶樻棫閲戦")
+ @Schema(description = "姣忓勾鎶樻棫閲戦")
private BigDecimal annualDepreciationAmount;
@TableField(exist = false)
- @ApiModelProperty("绱鎶樻棫")
+ @Schema(description = "绱鎶樻棫")
private BigDecimal deprAmount;
@TableField(exist = false)
- @ApiModelProperty("鍑�鍊�")
+ @Schema(description = "鍑�鍊�")
private BigDecimal netValue;
- @ApiModelProperty("璁惧绫诲瀷")
+ @Schema(description = "璁惧绫诲瀷")
private String type;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
}
--
Gitblit v1.9.3