From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
index 44cd0d1..f9e7fa6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Matnr.java
@@ -5,6 +5,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.service.BatchRegularService;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrGroupService;
@@ -223,7 +224,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
@ApiModelProperty("鍔ㄦ�佹墿灞曞瓧娈�")
@@ -247,6 +247,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -260,6 +261,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
--
Gitblit v1.9.1