From 5b883298571421132edf68cab7a22ab16a1f0a6b Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期四, 11 九月 2025 17:32:47 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong --- ruoyi-system/src/main/java/com/ruoyi/system/model/TErpIssueReporting.java | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpIssueReporting.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpIssueReporting.java index 625bce7..b489fad 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpIssueReporting.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpIssueReporting.java @@ -1,6 +1,7 @@ package com.ruoyi.system.model; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -41,7 +42,7 @@ @TableField("pictures") private String pictures; - @ApiModelProperty(value = "处理状态 1=已处理 2=未处理") + @ApiModelProperty(value = "处理状态 1=未处理 2=已处理") @TableField("status") private Integer status; @@ -53,5 +54,21 @@ @TableField("report_user_id") private String reportUserId; + @ApiModelProperty(value = "处理人") + @TableField("handler_person") + private String handlerPerson; + + @ApiModelProperty(value = "处理图片") + @TableField("handler_pictures") + private String handlerPictures; + + @ApiModelProperty(value = "处理时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @TableField("handler_time") + private LocalDateTime handlerTime; + + @ApiModelProperty(value = "处理内容") + @TableField("handler_content") + private String handlerContent; } -- Gitblit v1.7.1