Merge remote-tracking branch 'origin/master'

fuliqi

2024-03-20 b5ddee040392637abe891ad704249504a08d13b2

Merge remote-tracking branch 'origin/master'

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

@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDateTime;
import java.util.Date;

import com.ycl.platform.base.AbsEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -35,9 +37,12 @@
    @TableField("point_id")
    private Integer pointId;

    @TableField("report_type")
    private String reportType;

    @ApiModelProperty("审核时间")
    @TableField("auditing_time")
    private LocalDateTime auditingTime;
    private Date auditingTime;

    @ApiModelProperty("报备内容")
    @TableField("report_content")

 ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java

@@ -5,6 +5,8 @@
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.Report;
import java.time.LocalDateTime;
import java.util.Date;

import org.springframework.beans.BeanUtils;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@@ -34,7 +36,10 @@
    private Integer pointId;

    @ApiModelProperty("审核时间")
    private LocalDateTime auditingTime;
    private Date auditingTime;

    @ApiModelProperty("审核类型")
    private String reportType;

    @NotBlank(message = "报备内容不能为空", groups = {Add.class, Update.class})
    @ApiModelProperty("报备内容")

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/ReportVO.java

@@ -33,6 +33,9 @@
    private Integer pointId;
    private String pointName;

    /** 报备类型 */
    private String reportType;

    /** 审核时间 */
    private LocalDateTime auditingTime;