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

liyong

15 小时以前 2cc19f8033348f34df382d27f63810b2d6f56a05

 src/main/java/com/ruoyi/device/pojo/DeviceMaintenanceFile.java

文件名从 src/main/java/com/ruoyi/device/pojo/MaintenanceTaskFile.java 修改
@@ -22,9 +22,9 @@
 */
@Getter
@Setter
@TableName("maintenance_task_file")
@ApiModel(value = "MaintenanceTaskFile瀵硅薄", description = "璁惧淇濆吇闄勪欢")
public class MaintenanceTaskFile implements Serializable {
@TableName("device_maintenance_file")
@ApiModel(value = "DeviceMaintenanceFile瀵硅薄", description = "璁惧淇濆吇璁板綍闄勪欢")
public class DeviceMaintenanceFile implements Serializable {

    private static final long serialVersionUID = 1L;

@@ -40,8 +40,8 @@
    @ApiModelProperty("鏂囦欢澶у皬")
    private Integer fileSize;

    @ApiModelProperty("璁惧淇濆吇ID")
    private Integer maintenanceTaskId;
    @ApiModelProperty("璁惧淇濆吇璁板綍ID")
    private Integer deviceMaintenanceId;

    @ApiModelProperty("鍒涘缓鏃堕棿")
    @TableField(fill = FieldFill.INSERT)