From 833a285ef00a84fc1a88464eb3d7d1934cf71ff6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 23 四月 2026 14:45:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/java/com/ruoyi/approve/pojo/ApproveNode.java | 42 +++++++++++++++++++++++++++++++-----------
1 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
index 2ea7dd5..78f71ae 100644
--- a/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
+++ b/src/main/java/com/ruoyi/approve/pojo/ApproveNode.java
@@ -1,18 +1,16 @@
package com.ruoyi.approve.pojo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
-
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-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;
/**
* 瀹℃壒鑺傜偣琛�
@@ -21,8 +19,9 @@
@Data
@TableName("approve_node")
@ApiModel
-public class ApproveNode{
+public class ApproveNode implements Serializable {
+ private static final long serialVersionUID = 1L;
@ApiModelProperty("闄勪欢id")
@TableField(exist = false)
@@ -41,6 +40,10 @@
* 瀹℃壒缂栧彿
*/
private String approveProcessId;
+ /**
+ * 瀹℃壒id
+ */
+ private Long processId;
/**
* 瀹℃壒鑺傜偣椤哄簭
@@ -125,7 +128,24 @@
*/
private String approveNodeRemark;
- private static final long serialVersionUID = 1L;
+ /**
+ * 鍏ュ簱id
+ */
+ @TableField(exist = false)
+ private Long recordId;
+ /**
+ * 鏄惁鍏ュ簱瀹℃牳閫氳繃
+ */
+ @ApiModelProperty(value = "鏄惁鍏ュ簱瀹℃牳閫氳繃")
+ @TableField(exist = false)
+ private boolean inventoryReview;
+
+ /**
+ * 鍏ュ簱绫诲瀷锛堝悎鏍�/涓嶅悎鏍硷級
+ */
+ @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+ @TableField(exist = false)
+ private String storageType;
}
\ No newline at end of file
--
Gitblit v1.9.3