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/StateProcessModule.java | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java
new file mode 100644
index 0000000..5b41fda
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateProcessModule.java
@@ -0,0 +1,39 @@
+package com.ruoyi.system.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.domain.BaseModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName(value = "state_process_module")
+public class StateProcessModule extends BaseModel {
+
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private String id;
+ /**
+ * 1=合同新增
+ * 2=合同签订
+ * 3=合同提前终止
+ */
+ @ApiModelProperty(value = "规格类型")
+ @TableField("category")
+ private String category;
+ @ApiModelProperty(value = "涉及类型")
+ @TableField("name")
+ private String name;
+ @ApiModelProperty(value = "流程名称")
+ @TableField("template_name")
+ private String templateName;
+ @ApiModelProperty(value = "流程id")
+ @TableField("template_id")
+ private String templateId;
+ @ApiModelProperty(value = "备注")
+ @TableField("remark")
+ private String remark;
+}
--
Gitblit v1.7.1