From a96948456e0a21ab33deeb2edfdd7ef343aec5bf Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 16:20:34 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
index 0acac2d..d655683 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
@@ -3,7 +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.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,37 +18,37 @@
/**
* 鐢宠缂栧彿
*/
- @ApiModelProperty("鐢宠缂栧彿")
+ @Schema(description = "鐢宠缂栧彿")
@Excel(name = "鐢宠缂栧彿")
private String applicationNum;
/**
* 鍏憡鏍囬
*/
- @ApiModelProperty("鍏憡鏍囬")
+ @Schema(description = "鍏憡鏍囬")
@Excel(name = "鐢宠鏍囬")
private String title;
/**
* 鐢ㄥ嵃绫诲瀷
*/
- @ApiModelProperty("鐢ㄥ嵃绫诲瀷")
+ @Schema(description = "鐢ㄥ嵃绫诲瀷")
@Excel(name = "鐢ㄥ嵃绫诲瀷", readConverterExp = "official=鍏珷,contract=鍚堝悓涓撶敤绔�,finance=璐㈠姟涓撶敤绔�,legal=娉曚汉绔�")
private String sealType;
/**
* 鐢宠鐢ㄥ嵃鍘熷洜
*/
- @ApiModelProperty("鐢宠鐢ㄥ嵃鍘熷洜")
+ @Schema(description = "鐢宠鐢ㄥ嵃鍘熷洜")
private String reason;
/**
* 绱ф�ョ▼搴�
*/
- @ApiModelProperty("绱ф�ョ▼搴�")
+ @Schema(description = "绱ф�ョ▼搴�")
private String urgency;
/**
* 鐘舵��
*/
- @ApiModelProperty("鐘舵��")
+ @Schema(description = "鐘舵��")
@Excel(name = "鐘舵��", readConverterExp = "pending=寰呭鎵�,approved=宸查�氳繃,rejected=宸叉嫆缁�")
private String status;
--
Gitblit v1.9.3