From 5d24aead2d1a45452942ddfc300fe6a232301a99 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 25 九月 2023 11:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
index 3aeb2d5..641d16d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/RawInspect.java
@@ -1,5 +1,6 @@
package com.yuanchu.mom.pojo;
+import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
@@ -55,6 +56,11 @@
private Integer number;
/**
+ * 渚涘簲鍟�
+ */
+ private String supplier;
+
+ /**
* 妫�楠岀姸鎬� 0锛氭湭妫�楠岋紱1锛氬凡妫�楠�
*/
private Integer insState;
@@ -77,7 +83,6 @@
private String userName;
@ApiModelProperty(value = "閫昏緫鍒犻櫎 姝ｅ父>=1,鍒犻櫎<=0", hidden = true)
- @TableLogic(value = "1", delval = "0")
private Integer state;
/**
@@ -97,8 +102,8 @@
/**
* 鏉ユ枡鏃ユ湡
*/
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date formTime;
@TableField(exist = false)
--
Gitblit v1.9.3