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/StateTaskCenter.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java
index fe4e792..ab25bf9 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/StateTaskCenter.java
@@ -1,22 +1,42 @@
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.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value = "任务")
@TableName(value = "state_task_center" )
public class StateTaskCenter extends BaseModel {
- @TableId(type = IdType.NONE)
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
+ @ApiModelProperty(value = "任务名称")
+ @TableField("name")
private String name;
+ @ApiModelProperty(value = "模块名称")
+ @TableField("module_name")
private String moduleName;
+ @ApiModelProperty(value = "系统摘要")
+ @TableField("remark")
private String remark;
+ @ApiModelProperty(value = "类型")
+ @TableField("category")
private String category;
+ @ApiModelProperty(value = "流程id")
+ @TableField("flow_id")
private String flowId;
+ @TableField("variable")
private String variable;
+ @ApiModelProperty(value = "合同项目id")
+ @TableField("project_id")
+ private String projectId;
}
--
Gitblit v1.7.1