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

maven

10 天以前 1f1ef0f62c4953e3ff9c610cda8f3c4f8a45c025

 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;