Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 a3a0d8a83e538efc6cf27865e5a33bf26e958ff7

 ruoyi-system/src/main/java/com/ruoyi/system/vo/asset/OaApprovalApplicationStoragePageVO.java

@@ -19,6 +19,9 @@
    @ApiModelProperty("主键ID")
    private Integer id;

    @ApiModelProperty("资产类型ID")
    private Integer assetTypeId;

    @ApiModelProperty("所属部门")
    private String deptName;