Merge remote-tracking branch 'origin/master'

无关风月

6 天以前 acbe0c6c601ff1368002d701631a43a2c00b61f5

 ruoyi-system/src/main/java/com/ruoyi/system/query/AssetStatisticsListQuery.java

@@ -17,6 +17,8 @@
    private Integer assetTypeId;
    @ApiModelProperty(value = "资产分类ids 前端忽略")
    private List<Integer> assetTypeIds;
    @ApiModelProperty(value = "资产ids 前端忽略")
    private List<Integer> assetMainIds;
    @ApiModelProperty(value = "部门id 前端忽略")
    private Integer deptId;
    private List<Integer> deptIds;
}