Merge remote-tracking branch 'origin/master'

mitao

9 天以前 2bdcf12109e62a731eb16e90b6e1c39a67853fb1

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

@@ -46,7 +46,7 @@

    @ApiModelProperty(value = "入库类型 0-正常入库")
    @TableField("storage_type")
    private Boolean storageType;
    private Integer storageType;

    @ApiModelProperty(value = "入库日期")
    @TableField("storage_time")