Merge remote-tracking branch 'origin/master'

mitao

4 天以前 853c8ba11072eae475273864e61733ae7294f004

 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;