Merge branch 'feature_asset'

mitao

5 天以前 ab0ad84b5c577036f9ed5b53d2e90e81e5ba3de9

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