diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalInstance.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalInstance.java index f8e1f43..9476934 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalInstance.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalInstance.java @@ -86,5 +86,7 @@ public class ApprovalInstance implements Serializable { */ @ApiModelProperty("审批记录列表") private List recordList; + + private String name; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalRecord.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalRecord.java index 1dffdef..5670577 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalRecord.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/approval/domain/ApprovalRecord.java @@ -44,6 +44,7 @@ public class ApprovalRecord implements Serializable { @ApiModelProperty("审批人姓名") private String approverName; + private String name; @ApiModelProperty("审批结果(1通过 2驳回)") private String approveResult; diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/approval/ApprovalRecordMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/approval/ApprovalRecordMapper.xml index fd16009..119afb6 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/approval/ApprovalRecordMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/approval/ApprovalRecordMapper.xml @@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -25,9 +27,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"