Merge remote-tracking branch 'origin/master'

mitao

6 天以前 0b7e2752b6f1e87084b837043291c890cca780a8

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

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

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

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