Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-02 26e9d2d7953bcb8eecaa9f7ce0527abf64f73d0f

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java

@@ -1,14 +1,17 @@
package com.ycl.platform.domain.entity;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;

import java.time.LocalDateTime;
import java.util.Date;

/**
 * 运维点位
@@ -37,8 +40,8 @@
    private LocalDateTime endTime;

    @ApiModelProperty("运维单位")
    @TableField("unit_id")
    private Integer unitId;
    @TableField(value = "unit_id", updateStrategy = FieldStrategy.IGNORED)
    private Long unitId;

    @ApiModelProperty("运维状态")
    @TableField("status")
@@ -48,5 +51,25 @@
    @TableField("remark")
    private String remark;

    @ApiModelProperty("运维类型")
    @TableField("category")
    private Short category;

    @ApiModelProperty("上报部门")
    @TableField("dept_id")
    private Long deptId;

    @TableField("point_tag")
    private String pointTag;

    @TableField("reason")
    private String reason;

    @TableField("recovery")
    private Integer recovery;

    @TableField("recovery_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date recoveryTime;

}