From c247f5bf64c98595cc7e4efc9e1ae7ff1df79c11 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 23 四月 2026 14:05:32 +0800
Subject: [PATCH] refactor(swagger): 迁移Swagger注解到OpenAPI 3.0
---
src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java b/src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java
index 0237194..7a1f88c 100644
--- a/src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java
+++ b/src/main/java/com/ruoyi/officesupplies/pojo/OfficeSupplies.java
@@ -4,8 +4,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.CommonFile;
-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 @@
* @date : 2025/9/4 14:02
*/
@Data
-@ApiModel
+@Schema
@TableName("office_supplies")
public class OfficeSupplies {
@@ -27,49 +26,49 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
- @ApiModelProperty("缂栧彿")
+ @Schema(description = "缂栧彿")
@Excel(name = "缂栧彿")
private String code;
- @ApiModelProperty("鐗╁搧鍚嶇О")
+ @Schema(description = "鐗╁搧鍚嶇О")
private String itemName;
- @ApiModelProperty("鐢宠浜�")
+ @Schema(description = "鐢宠浜�")
@Excel(name = "鐢宠浜�")
private String applicant;
/**
* 閮ㄩ棬
*/
- @ApiModelProperty("閮ㄩ棬")
+ @Schema(description = "閮ㄩ棬")
@Excel(name = "閮ㄩ棬")
private String dept;
/**
* 鐗╄祫绫诲瀷锛�1-鍏朵粬 2-娓呮磥鐢ㄥ搧 3-鐢靛瓙鐢ㄥ搧 4-鐢靛瓙璁惧锛�
*/
- @ApiModelProperty("鐗╄祫绫诲瀷锛�1-鍏朵粬 2-娓呮磥鐢ㄥ搧 3-鐢靛瓙鐢ㄥ搧 4-鐢靛瓙璁惧锛�")
+ @Schema(description = "鐗╄祫绫诲瀷锛�1-鍏朵粬 2-娓呮磥鐢ㄥ搧 3-鐢靛瓙鐢ㄥ搧 4-鐢靛瓙璁惧锛�")
@Excel(name = "鐗╄祫绫诲瀷", readConverterExp = "1=鍏朵粬,2=娓呮磥鐢ㄥ搧,3=鐢靛瓙鐢ㄥ搧,4=鐢靛瓙璁惧")
private Integer materialType;
/**
* 鐢宠鏁伴噺
*/
- @ApiModelProperty("鐢宠鏁伴噺")
+ @Schema(description = "鐢宠鏁伴噺")
@Excel(name = "鐢宠鏁伴噺")
private Integer applyNum;
/**
* 瀹℃壒鎰忚
*/
- @ApiModelProperty("瀹℃壒鎰忚")
+ @Schema(description = "瀹℃壒鎰忚")
// @Excel(name = "瀹℃壒鎰忚")
private String approvalOpinions;
/**
* 鐢宠鍘熷洜
*/
- @ApiModelProperty("鐢宠鍘熷洜")
+ @Schema(description = "鐢宠鍘熷洜")
@Excel(name = "鐢宠鍘熷洜")
private String reason;
@@ -77,21 +76,21 @@
/**
* 绱ф�ョ▼搴︼紙1-鏅�� 2-绱ф�� 3-闈炲父绱ф�ワ級
*/
- @ApiModelProperty("绱ф�ョ▼搴︼紙1-鏅�� 2-绱ф�� 3-闈炲父绱ф�ワ級")
+ @Schema(description = "绱ф�ョ▼搴︼紙1-鏅�� 2-绱ф�� 3-闈炲父绱ф�ワ級")
// @Excel(name = "绱ф�ョ▼搴�", readConverterExp = "1=鏅��,2=绱ф��,3=闈炲父绱ф��")
private Integer urgency;
/**
* 鐘舵�侊紙1-寰呭鎵� 2-宸叉嫆缁� 3-宸查�氳繃 4-宸插彂鏀撅級
*/
- @ApiModelProperty("鐘舵�侊紙1-寰呭鎵� 2-宸叉嫆缁� 3-宸查�氳繃 4-宸插彂鏀撅級")
+ @Schema(description = "鐘舵�侊紙1-寰呭鎵� 2-宸叉嫆缁� 3-宸查�氳繃 4-宸插彂鏀撅級")
@Excel(name = "鐘舵��", readConverterExp = "1=寰呭鎵�,2=宸叉嫆缁�,3=宸查�氳繃,4=宸插彂鏀�")
private Integer status;
/**
* 鐢宠鏃堕棿
*/
- @ApiModelProperty("鐢宠鏃堕棿")
+ @Schema(description = "鐢宠鏃堕棿")
@Excel(name = "鐢宠鏃堕棿" , width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -101,14 +100,14 @@
/**
* 瀹℃壒浜�
*/
- @ApiModelProperty("瀹℃壒浜�")
+ @Schema(description = "瀹℃壒浜�")
@Excel(name = "瀹℃壒浜�")
private String approval;
/**
* 瀹℃壒鏃堕棿
*/
- @ApiModelProperty("瀹℃壒鏃堕棿")
+ @Schema(description = "瀹℃壒鏃堕棿")
@Excel(name = "瀹℃壒鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -117,13 +116,13 @@
/**
* 鍙戞斁鏃堕棿
*/
- @ApiModelProperty("鍙戞斁鏃堕棿")
+ @Schema(description = "鍙戞斁鏃堕棿")
@Excel(name = "鍙戞斁鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date issueTime;
- @ApiModelProperty("鍙戞斁浜�")
+ @Schema(description = "鍙戞斁浜�")
// @Excel(name = "鍙戞斁浜�")
private String issueUser;
--
Gitblit v1.9.3