Merge remote-tracking branch 'origin/master'

无关风月

6 天以前 acbe0c6c601ff1368002d701631a43a2c00b61f5

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

@@ -26,5 +26,8 @@

    @ApiModelProperty("关键字（资产名称/资产编码）")
    private String keyword;

    @ApiModelProperty("所属部门ID，前端不传")
    private Integer deptId;
}