From 43a8301f04a6ea7891ef16861734163b2646e07f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 14 一月 2026 18:05:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
index d7a4222..4055f21 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
@@ -2,6 +2,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 lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -18,17 +19,20 @@
* 鐢宠缂栧彿
*/
@ApiModelProperty("鐢宠缂栧彿")
+ @Excel(name = "鐢宠缂栧彿")
private String applicationNum;
/**
* 鍏憡鏍囬
*/
@ApiModelProperty("鍏憡鏍囬")
+ @Excel(name = "鐢宠鏍囬")
private String title;
/**
* 鐢ㄥ嵃绫诲瀷
*/
@ApiModelProperty("鐢ㄥ嵃绫诲瀷")
+ @Excel(name = "鐢ㄥ嵃绫诲瀷", readConverterExp = "official=鍏珷,contract=鍚堝悓涓撶敤绔�,finance=璐㈠姟涓撶敤绔�,legal=娉曚汉绔�")
private String sealType;
/**
* 鐢宠鐢ㄥ嵃鍘熷洜
@@ -45,7 +49,13 @@
* 鐘舵��
*/
@ApiModelProperty("鐘舵��")
+ @Excel(name = "鐘舵��", readConverterExp = "pending=寰呭鎵�,approved=宸查�氳繃,rejected=宸叉嫆缁�")
private String status;
+
+ /**
+ * 瀹℃壒浜�
+ */
+ private Long approveUserId;
/**
* 鍒涘缓鑰�
*/
--
Gitblit v1.9.3