Merge remote-tracking branch 'origin/master'

mitao

2 天以前 bdd967acce69d2420d9866789dfcee42c7e77023

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