Merge branch 'feature_asset'

mitao

昨天 0146a1483a3368f75daa6eb03aa42c714943e6b2

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

@@ -11,6 +11,7 @@

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;

/**
 * <p>
@@ -40,6 +41,10 @@
    @TableField("title")
    private String title;

    @ApiModelProperty(value = "申请日期")
    @TableField("application_date")
    private Date applicationDate;

    @ApiModelProperty(value = "资产类型")
    @TableField("asset_type_id")
    private Integer assetTypeId;