Merge remote-tracking branch 'origin/master'

无关风月

96 分钟以前 27d8f8fbb2e02be63338b80f808969faa35adac0

 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;
}