From 66e89415b0592169ce7e1d1c22c8fd78cc89a83c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 五月 2025 09:47:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecordOperation.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecordOperation.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecordOperation.java
index b6c5cd3..88df281 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecordOperation.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TSamplingRecordOperation.java
@@ -1,13 +1,16 @@
package com.ruoyi.system.model;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import java.io.Serializable;
import java.time.LocalDateTime;
/**
@@ -35,7 +38,7 @@
@ApiModelProperty(value = "工艺时间")
@TableField("process_time")
- private LocalDateTime processTime;
+ private String processTime;
@ApiModelProperty(value = "取样名称")
@TableField("sampling_name")
@@ -102,6 +105,7 @@
private Integer sampleAmount;
@ApiModelProperty(value = "送样时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("send_sample_time")
private LocalDateTime sendSampleTime;
@@ -111,7 +115,7 @@
@ApiModelProperty(value = "操作人")
@TableField("handle_person_id")
- private Integer handlePersonId;
+ private Long handlePersonId;
@ApiModelProperty(value = "状态 1=待发送 2=待接收 3=已接收")
@TableField("status")
@@ -119,25 +123,27 @@
@ApiModelProperty(value = "送样人")
@TableField("send_person_id")
- private Integer sendPersonId;
+ private Long sendPersonId;
@ApiModelProperty(value = "送样签字")
@TableField("send_sign")
private String sendSign;
@ApiModelProperty(value = "送样时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("send_time")
private LocalDateTime sendTime;
@ApiModelProperty(value = "接收人")
@TableField("receipts_person_id")
- private Integer receiptsPersonId;
+ private Long receiptsPersonId;
@ApiModelProperty(value = "接收签字")
@TableField("receipts_sign")
private String receiptsSign;
@ApiModelProperty(value = "接收时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("receipts_time")
private LocalDateTime receiptsTime;
--
Gitblit v1.7.1