Merge remote-tracking branch 'origin/master'

无关风月

1 天以前 2aa0dd9c34c6be86e70b1d2d939d3660552cb514

 ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalFlowNode.java

@@ -84,5 +84,7 @@
    @TableField("disabled")
    private Boolean disabled;


    @ApiModelProperty(value = "审批人名称")
    @TableField(exist = false)
    private String approvalName;
}