Merge branch 'feature_asset'

mitao

昨天 0146a1483a3368f75daa6eb03aa42c714943e6b2

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

@@ -30,11 +30,11 @@

    @ApiModelProperty(value = "主键")
    @TableId(value = "id", type = IdType.AUTO)
    private Long id;
    private Integer id;

    @ApiModelProperty(value = "申请ID")
    @TableField("application_id")
    private Long applicationId;
    private Integer applicationId;

    @ApiModelProperty(value = "申请单号")
    @TableField("application_code")