Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 eaef137e2a787d55f5d31b39ec3a104675368579

 ruoyi-system/src/main/java/com/ruoyi/system/model/AssetAd.java

@@ -45,6 +45,10 @@
    @TableField("asset_type_id")
    private Integer assetTypeId;

    @ApiModelProperty(value = "所属部门")
    @TableField("dept_id")
    private Integer deptId;

    @ApiModelProperty(value = "位置")
    @TableField("location")
    private String location;