Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 a3a0d8a83e538efc6cf27865e5a33bf26e958ff7

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

@@ -158,7 +158,6 @@
    @TableField("is_in_use")
    private Integer inUse;


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