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

gongchunyi

2026-05-22 bbd9823e935293b4815963647fecf48e3ba7ee1b

1
2
3
4
5
6
7
8
9
10
11
12
13
14
package com.ruoyi.device.dto;
 
import com.ruoyi.device.pojo.DeviceDefectRecord;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
 
@Data
public class DeviceDefectRecordDto extends DeviceDefectRecord {
    @Schema(description = "设备名称")
    private String deviceName;
 
    @Schema(description = "设备型号")
    private String deviceModel;
}