From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期四, 28 三月 2024 14:04:24 +0800 Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java index c76b286..1ac751e 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcMessageApproval.java @@ -1,5 +1,6 @@ package org.jeecg.modules.mdc.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -81,5 +82,16 @@ @Excel(name = "涓婃姤鍐呭", width = 15) @ApiModelProperty(value = "涓婃姤鍐呭") private String reportContent; - + /** + * 澶勭悊鎸夐挳 + */ + @TableField(exist = false) + @ApiModelProperty(value = "澶勭悊鎸夐挳") + private Boolean hasProcess = false; + /** + * 纭鎸夐挳 + */ + @TableField(exist = false) + @ApiModelProperty(value = "纭鎸夐挳") + private Boolean hasConfirm = false; } -- Gitblit v1.9.3