From 7ab45e2b02facae5685ba879d150de6dc0032aa4 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 25 五月 2026 10:38:59 +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/approve/pojo/ApprovalInstance.java | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 152 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApprovalInstance.java b/src/main/java/com/ruoyi/approve/pojo/ApprovalInstance.java
new file mode 100644
index 0000000..77d8d58
--- /dev/null
+++ b/src/main/java/com/ruoyi/approve/pojo/ApprovalInstance.java
@@ -0,0 +1,152 @@
+package com.ruoyi.approve.pojo;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 瀹℃壒瀹炰緥琛�
+ * </p>
+ *
+ * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @since 2026-05-18 03:27:46
+ */
+@Getter
+@Setter
+@ToString
+@TableName("approval_instance")
+@ApiModel(value = "ApprovalInstance瀵硅薄", description = "瀹℃壒瀹炰緥琛�")
+public class ApprovalInstance implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 瀹℃壒瀹炰緥ID
+ */
+ @Schema(description ="瀹℃壒瀹炰緥ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 瀹℃壒缂栧彿
+ */
+ @Schema(description ="瀹℃壒缂栧彿")
+ private String instanceNo;
+
+ /**
+ * 妯℃澘ID
+ */
+ @Schema(description ="妯℃澘ID")
+ private Long templateId;
+
+ /**
+ * 妯℃澘鍚嶇О
+ */
+ @Schema(description ="妯℃澘鍚嶇О")
+ private String templateName;
+
+ /**
+ * 涓氬姟ID
+ */
+ @Schema(description ="涓氬姟ID")
+ private Long businessId;
+
+ /**
+ * 涓氬姟绫诲瀷
+ */
+ @Schema(description ="涓氬姟绫诲瀷")
+ private Long businessType;
+
+ /**
+ * 瀹℃壒鏍囬
+ */
+ @Schema(description ="瀹℃壒鏍囬")
+ private String title;
+
+ /**
+ * 瀹℃壒鐘舵��
+ */
+ @Schema(description ="瀹℃壒鐘舵�� PENDING - 寰呭鎵�/杩涜涓� APPROVED - 宸查�氳繃/宸插畬鎴� REJECTED - 宸查┏鍥�")
+ private String status;
+
+ /**
+ * 褰撳墠瀹℃壒绾у埆
+ */
+ @Schema(description ="褰撳墠瀹℃壒绾у埆")
+ private Integer currentLevel;
+
+ /**
+ * 鐢宠浜篒D
+ */
+ @Schema(description ="鐢宠浜篒D")
+ private Long applicantId;
+
+ /**
+ * 鐢宠浜哄悕绉�
+ */
+ @Schema(description ="鐢宠浜哄悕绉�")
+ private String applicantName;
+
+ /**
+ * 鐢宠鏃堕棿
+ */
+ @Schema(description ="鐢宠鏃堕棿")
+ private LocalDateTime applyTime;
+
+ /**
+ * 瀹屾垚鏃堕棿
+ */
+ @Schema(description ="瀹屾垚鏃堕棿")
+ private LocalDateTime finishTime;
+
+ /**
+ * 鍒涘缓浜�
+ */
+ @Schema(description ="鍒涘缓浜�")
+ @TableField(fill = FieldFill.INSERT)
+ private Long createUser;
+
+ /**
+ * 鍒涘缓鏃堕棿
+ */
+ @Schema(description ="鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+
+ /**
+ * 鏇存柊浜�
+ */
+ @Schema(description ="鏇存柊浜�")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private Long updateUser;
+
+ /**
+ * 鏇存柊鏃堕棿
+ */
+ @Schema(description ="鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+ /**
+ * 閫昏緫鍒犻櫎
+ */
+ @Schema(description ="閫昏緫鍒犻櫎")
+ private Byte deleted;
+
+ @Schema(description = "琛ㄥ崟鏁版嵁")
+ private String formConfig;
+}
--
Gitblit v1.9.3