Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 3de2d31db9ac65c354fd228ab84fa2ed786482b9

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

@@ -41,10 +41,6 @@
    @TableField("title")
    private String title;

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

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