Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-ma...

huminmin

2 天以前 0b74a2f97b75a582ec4a3c5380523c503abff31f

 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;