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/aftersalesservice/pojo/AfterSalesNearExpiry.java | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java
index 0937b5b..d33a1d0 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/pojo/AfterSalesNearExpiry.java
@@ -6,8 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
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;
@@ -25,70 +24,70 @@
*/
@Data
@TableName("after_sales_near_expiry")
-@ApiModel("涓存湡鍞悗绠＄悊琛�")
+@Schema(name = "涓存湡鍞悗绠＄悊琛�")
public class AfterSalesNearExpiry {
@TableId(type = IdType.AUTO)
- @ApiModelProperty("涓婚敭")
+ @Schema(description = "涓婚敭")
private Long id;
- @ApiModelProperty("涓存湡浜у搧鍚嶇О")
+ @Schema(description = "涓存湡浜у搧鍚嶇О")
private String productName;
- @ApiModelProperty("浜у搧鎵瑰彿")
+ @Schema(description = "浜у搧鎵瑰彿")
private String batchNumber;
- @ApiModelProperty("涓存湡鏃ユ湡")
+ @Schema(description = "涓存湡鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate expireDate;
- @ApiModelProperty("搴撳瓨鏁伴噺")
+ @Schema(description = "搴撳瓨鏁伴噺")
private Integer stockQuantity;
- @ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
- @ApiModelProperty("鑱旂郴鐢佃瘽")
+ @Schema(description = "鑱旂郴鐢佃瘽")
private String contactPhone;
- @ApiModelProperty("闂鎻忚堪")
+ @Schema(description = "闂鎻忚堪")
private String disRes;
- @ApiModelProperty("澶勭悊缁撴灉")
+ @Schema(description = "澶勭悊缁撴灉")
private String disposeResult;
- @ApiModelProperty("澶勭悊鐘舵�� (1-寰呭鐞� 2-宸插鐞�)")
+ @Schema(description = "澶勭悊鐘舵�� (1-寰呭鐞� 2-宸插鐞�)")
private Integer status;
- @ApiModelProperty("澶勭悊浜篒D")
+ @Schema(description = "澶勭悊浜篒D")
private Long disposeUserId;
- @ApiModelProperty("澶勭悊浜哄悕绉�")
+ @Schema(description = "澶勭悊浜哄悕绉�")
private String disposeNickName;
- @ApiModelProperty("澶勭悊鏃ユ湡")
+ @Schema(description = "澶勭悊鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate disDate;
- @ApiModelProperty("鍒涘缓鑰�")
+ @Schema(description = "鍒涘缓鑰�")
private Long createUser;
- @ApiModelProperty("鍒涘缓鏃堕棿")
+ @Schema(description = "鍒涘缓鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty("淇敼鑰�")
+ @Schema(description = "淇敼鑰�")
private Long updateUser;
- @ApiModelProperty("淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
- @ApiModelProperty("绉熸埛id")
+ @Schema(description = "绉熸埛id")
private Long tenantId;
@TableField(fill = FieldFill.INSERT)
--
Gitblit v1.9.3