From 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 16:26:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java
index 9079c90..b2c287d 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/RulesRegulationsManagementFile.java
@@ -7,8 +7,7 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
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;
@@ -23,7 +22,7 @@
@Getter
@Setter
@TableName("rules_regulations_management_file")
-@ApiModel(value = "RulesRegulationsManagementFile瀵硅薄", description = "瑙勭珷鍒跺害绠＄悊--闄勪欢")
+@Schema(name = "RulesRegulationsManagementFile瀵硅薄", description = "瑙勭珷鍒跺害绠＄悊--闄勪欢")
public class RulesRegulationsManagementFile implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,35 +30,35 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鏂囦欢鍚嶇О")
+ @Schema(description = "鏂囦欢鍚嶇О")
private String name;
- @ApiModelProperty("鏂囦欢璺緞")
+ @Schema(description = "鏂囦欢璺緞")
private String url;
- @ApiModelProperty("鏂囦欢澶у皬")
+ @Schema(description = "鏂囦欢澶у皬")
private Integer fileSize;
- @ApiModelProperty("瑙勭珷鍒跺害ID")
+ @Schema(description = "瑙勭珷鍒跺害ID")
private Integer rulesRegulationsManagementId;
- @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;
- @ApiModelProperty("绉熸埛ID")
+ @Schema(description = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
--
Gitblit v1.9.3