Merge remote-tracking branch 'origin/master'

无关风月

5 天以前 b84fc1807a6ce71f4d10cdb10da186abc5dcc173

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

@@ -54,6 +54,10 @@
    @TableField("specification_model")
    private String specificationModel;

    @ApiModelProperty(value = "类别")
    @TableField("category")
    private String category;

    @ApiModelProperty(value = "资产类别ID，关联asset_type表")
    @TableField("asset_type_id")
    private Integer assetTypeId;