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

云

2 天以前 69dc6b16ef04bdfbfa65f77c169c0847dc7e65c2

 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;
}