Merge remote-tracking branch 'origin/master'

无关风月

3 天以前 0d1a73f4c0d35951dc42f0e35526d69c0e922afc

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

@@ -11,7 +11,7 @@

import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.LocalDate;

/**
 * <p>
@@ -43,7 +43,7 @@

    @ApiModelProperty(value = "维修完成时间")
    @TableField("repair_finish_time")
    private LocalDateTime repairFinishTime;
    private LocalDate repairFinishTime;

    @ApiModelProperty(value = "维修花费" )
    @TableField("repair_fee")