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

云

22 小时以前 3d556b8defe1ff5b9aeb481bd1d0a67b2ded0192

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

@@ -1,14 +1,14 @@
package com.ruoyi.device.dto;

import com.ruoyi.device.pojo.DeviceDefectRecord;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

@Data
public class DeviceDefectRecordDto extends DeviceDefectRecord {
    @ApiModelProperty("设备名称")
    @Schema(description = "设备名称")
    private String deviceName;

    @ApiModelProperty("设备型号")
    @Schema(description = "设备型号")
    private String deviceModel;
}