Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-05 cd24a045bd9ee29505ddc9760d25f5d4037f4f0c

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

@@ -2,12 +2,13 @@

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
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.util.Date;

/**
 * 报备
@@ -32,12 +33,11 @@
    private Integer peopleId;

    @ApiModelProperty("点位ID")
    @TableField("point_id")
    private Integer pointId;
    @TableField("serial_number")
    private String serialNumber;

    @ApiModelProperty("审核时间")
    @TableField("auditing_time")
    private LocalDateTime auditingTime;
    @TableField("report_type")
    private String reportType;

    @ApiModelProperty("报备内容")
    @TableField("report_content")
@@ -51,5 +51,23 @@
    @TableField("error_type")
    private String errorType;

    @ApiModelProperty("状态: 0：未审核，1：审核通过，2：审核驳回")
    @TableField("status")
    private Integer status;

    @ApiModelProperty("生效时间")
    @TableField("begin_create_time")
    private Date beginCreateTime;

    @ApiModelProperty("失效时间")
    @TableField("end_create_time")
    private Date endCreateTime;

    /** 标识号：可用于查询历史审核记录 */
    @TableField("identify")
    private String identify;

    /** 导入批次号 */
    @TableField("import_batch_number")
    private String importBatchNumber;
}