From d74e68c09225f654df2109ec2ecd3fb4639f4415 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 18 Dec 2023 11:34:11 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=81=E7=A8=8B):=20=E6=9C=AA=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/activiti/entity/ProcessApprovalRecord.java | 4 ++-- .../java/com/jero/modules/activiti/enums/CommitFlagEnum.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java index 7b1a4f44..f4e02906 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessApprovalRecord.java @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.util.Date; import lombok.Data; +import java.util.Date; /** *流程审批记录表 @@ -102,7 +102,7 @@ public class ProcessApprovalRecord { */ @Dict(dicCode = "commit_flag") @TableField(value = "commit_flag") - @ApiModelProperty(value = "审批意见(1通过,2驳回)") + @ApiModelProperty(value = "审批意见(1通过,2驳回,3未处理)") private Integer commitFlag; /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/enums/CommitFlagEnum.java b/laws-modules/src/main/java/com/jero/modules/activiti/enums/CommitFlagEnum.java index 7277add7..a1537574 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/enums/CommitFlagEnum.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/enums/CommitFlagEnum.java @@ -15,6 +15,7 @@ public enum CommitFlagEnum { */ PASS("通过", 1), REJECT("驳回", 2), + UNDISPOSED("未处理", 3) ; private String name;