Merge remote-tracking branch 'origin/master'

mitao

2 天以前 325c6107782d4a2284bb24be688e7a87462dc202

 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;
}