From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java
new file mode 100644
index 0000000..0ed879b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessInstanceAction.java
@@ -0,0 +1,65 @@
+package com.ruoyi.system.model;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.ruoyi.common.core.domain.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "工作流-实例操作记录表")
+@TableName(value = "state_process_instance_action")
+public class StateProcessInstanceAction implements Serializable {
+
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private String id;
+ @ApiModelProperty(value = "流程实例id")
+ @TableField("instance_id")
+ private String instanceId;
+ @ApiModelProperty(value = "抄送、自动审批：true")
+ @TableField("robot")
+ private boolean robot;
+ @ApiModelProperty(value = "审批办理人id")
+ @TableField("auditor_id")
+ private String auditorId;
+ @ApiModelProperty(value ="动作类型")
+ @TableField("action_type")
+ private Integer actionType;
+ @ApiModelProperty(value = "抄送人")
+ @TableField("user_ids")
+ private String userIds;
+ @ApiModelProperty(value = "分配人ID")
+ @TableField("assignee_id")
+ private String assigneeId;
+ @ApiModelProperty(value = "节点ID")
+ @TableField("node_id")
+ private String nodeId;
+ @ApiModelProperty(value = "备注")
+ @TableField("remark")
+ private String remark;
+ @ApiModelProperty(value = "图片")
+ @TableField("pictures")
+ private String pictures;
+ /**
+ * 删除 未删除
+ */
+ @TableField("`disabled`")
+ @TableLogic
+ private Boolean disabled;
+
+ @ApiModelProperty(value = "记录创建时间，前端忽略")
+ @TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
+
+ @TableField(exist = false)
+ private String nickName;
+
+}
--
Gitblit v1.7.1