Merge remote-tracking branch 'origin/dev_New' into dev_New

yaowanxin

2 天以前 6f888b234148d1a4dbd1e6c28a8d9ed85ebfda09

 src/main/java/com/ruoyi/device/dto/DeviceRepairDto.java

@@ -26,6 +26,8 @@

    @ApiModelProperty("报修时间")
    private Date repairTime;
    
    private String repairTimeStr;

    @ApiModelProperty("报修人")
    private String repairName;
@@ -39,6 +41,8 @@
    @ApiModelProperty("维修时间")
    private Date maintenanceTime;

    private String maintenanceTimeStr;

    @ApiModelProperty("维修结果")
    private String maintenanceResult;