From c9e784140d837cb27a4f93935b08bbb739d47c8e Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 13 八月 2025 17:08:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'
---
src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
index 8ede335..18c624c 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveProcess.java
@@ -3,9 +3,13 @@
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.sales.pojo.CommonFile;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -14,6 +18,7 @@
*/
@Data
@TableName("approve_process")
+@ApiModel
public class ApproveProcess{
/**
*
@@ -21,9 +26,13 @@
@TableId(type = IdType.AUTO)
private Long id;
+ @TableField(exist = false)
+ private List<CommonFile> commonFileList;
+
/**
* 娴佺▼缂栧彿
*/
+ @ApiModelProperty(value = "娴佺▼缂栧彿")
private String approveId;
/**
@@ -44,6 +53,7 @@
/**
* 鐢宠閮ㄩ棬鍚嶇О
*/
+ @ApiModelProperty(value = "鐢宠閮ㄩ棬鍚嶇О")
private String approveDeptName;
/**
@@ -59,6 +69,7 @@
/**
* 鐢宠鍘熷洜
*/
+ @ApiModelProperty(value = "鐢宠鍘熷洜")
private String approveReason;
/**
@@ -75,6 +86,7 @@
* 鐢宠鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @ApiModelProperty(value = "鐢宠鏃ユ湡")
private Date approveTime;
/**
@@ -86,6 +98,7 @@
/**
* 瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�
*/
+ @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0寰呭鏍革紝1瀹℃牳涓紝2瀹℃牳瀹屾垚 3瀹℃牳鏈�氳繃 4宸查噸鏂版彁浜�")
private Integer approveStatus;
/**
@@ -107,6 +120,7 @@
/**
* 瀹℃壒澶囨敞
*/
+ @ApiModelProperty(value = "瀹℃壒澶囨敞")
private String approveRemark;
/**
--
Gitblit v1.9.3