Merge remote-tracking branch 'origin/master'

无关风月

10 小时以前 27d8f8fbb2e02be63338b80f808969faa35adac0

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

@@ -142,6 +142,19 @@
    @TableField("attachment_urls")
    private String attachmentUrls;

    @ApiModelProperty(value = "是否被处置")
    @TableField("is_disposed")
    private Integer disposed;

    @ApiModelProperty(value = "是否借用未归还")
    @TableField("is_borrowed")
    private Integer borrowed;

    @ApiModelProperty(value = "是否被领用")
    @TableField("is_in_use")
    private Integer inUse;


    @ApiModelProperty(value = "创建时间")
    @TableField("create_time")
    private LocalDateTime createTime;