From 1d073089d28720503a5350718f10c97a2a9dc502 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 03 五月 2025 19:32:19 +0800
Subject: [PATCH] 逻辑删除改成物理删除

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
index 30f8dad..bb954fc 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/MatnrGroup.java
@@ -4,6 +4,8 @@
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -41,9 +43,15 @@
     private String name;
 
     /**
+     * 鍒嗙粍缂栫爜
+     */
+    @ApiModelProperty("涓婄骇鍒嗙粍缂栫爜")
+    private String parCode;
+
+    /**
      * 鐗╂枡缂栫爜
      */
-    @ApiModelProperty(value= "鐗╂枡缂栫爜")
+    @ApiModelProperty(value= "鍒嗙粍缂栫爜")
     private String code;
 
     /**
@@ -62,7 +70,6 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
-    @TableLogic
     private Integer deleted;
 
     /**
@@ -82,6 +89,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;
 
     /**
@@ -95,6 +103,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