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

liding

6 天以前 1284fb157043e488aa1794d8f1b64ebf18aa5147

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.annotations.ApiModelProperty;
import lombok.Data;
 
@Data
public class DeviceDefectRecordDto extends DeviceDefectRecord {
    @ApiModelProperty("设备名称")
    private String deviceName;
 
    @ApiModelProperty("设备型号")
    private String deviceModel;
}