diff --git a/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java b/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java
index 35641c47..06b10def 100644
--- a/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java
+++ b/SC-boot/linkage-common/src/main/java/jnpf/database/config/MybatisPlusMetaObjectHandler.java
@@ -63,12 +63,39 @@ private static ApplicationContext applicationContext;
 //        userProvider= applicationContext.getBean(UserProvider.class);
         UserInfo userInfo = userProvider.get();
 
-        this.setFieldValByName("lastModifyTime", DateUtil.getNowDate(), metaObject);
-        this.setFieldValByName("lastModifyUserId", userInfo.getUserId(), metaObject);
-        this.setFieldValByName("lastModifyUserName", userInfo.getUserName(), metaObject);
+        Object lastModifyTime = this.getFieldValByName("lastModifyTime", metaObject);
+        Object lastModifyUserId = this.getFieldValByName("lastModifyUserId", metaObject);
+        Object lastModifyUserName = this.getFieldValByName("lastModifyUserName", metaObject);
+
+        if (lastModifyTime==null){
+            this.setFieldValByName("lastModifyTime", DateUtil.getNowDate(), metaObject);
+        }
+        if (lastModifyUserId==null){
+            this.setFieldValByName("lastModifyUserId", userInfo.getUserId(), metaObject);
+        }
+        if (lastModifyUserName==null){
+            this.setFieldValByName("lastModifyUserName", userInfo.getUserName(), metaObject);
+
+        }
+//        this.setFieldValByName("lastModifyTime", DateUtil.getNowDate(), metaObject);
+//        this.setFieldValByName("lastModifyUserId", userInfo.getUserId(), metaObject);
+//        this.setFieldValByName("lastModifyUserName", userInfo.getUserName(), metaObject);
+
+
+        Object deleteTime = this.getFieldValByName("deleteTime", metaObject);
+        Object deleteUserId = this.getFieldValByName("deleteUserId", metaObject);
+        Object deleteUserName = this.getFieldValByName("deleteUserName", metaObject);
+        if (deleteTime==null){
+            this.setFieldValByName("deleteTime", DateUtil.getNowDate(), metaObject);
+        }
+        if (deleteUserId==null){
+            this.setFieldValByName("deleteUserId", userInfo.getUserId(), metaObject);
+        }
+        if(deleteUserName==null) {
+            this.setFieldValByName("deleteUserName", userInfo.getUserName(), metaObject);
+        }
+
 
-        Object deleteMark = this.getFieldValByName("deleteMark", metaObject);
-//        if (deleteMark!=null&&String.valueOf(deleteMark).equals(""))
     }
 
 
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerEntity.java
index 19c3dbb8..740787b9 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/customer/entity/CustomerEntity.java
@@ -1,13 +1,9 @@
 package jnpf.customer.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 /**
@@ -25,34 +21,35 @@ public class CustomerEntity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
+    @TableLogic
     private String deleteMark;
 
     @TableField("ORGNIZE_ID")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/entity/MaterialEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/entity/MaterialEntity.java
index dd5efe1f..8545618a 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/entity/MaterialEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/entity/MaterialEntity.java
@@ -1,8 +1,6 @@
 package jnpf.materialvo.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -24,34 +22,35 @@ public class MaterialEntity  {
     @TableId("ID")
     private String id;
 
-    @TableField("CREATOR_USER_ID")
+    @TableField(value = "CREATOR_USER_ID",fill = FieldFill.INSERT)
     private String creatorUserId;
 
-    @TableField("CREATOR_USER_NAME")
+    @TableField(value = "CREATOR_USER_NAME",fill = FieldFill.INSERT)
     private String creatorUserName;
 
-    @TableField("CREATOR_TIME")
+    @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
     private Date creatorTime;
 
-    @TableField("LAST_MODIFY_USER_ID")
+    @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.UPDATE)
     private String lastModifyUserId;
 
-    @TableField("LAST_MODIFY_USER_NAME")
+    @TableField(value = "LAST_MODIFY_USER_NAME",fill = FieldFill.UPDATE)
     private String lastModifyUserName;
 
-    @TableField("LAST_MODIFY_TIME")
+    @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME")
     private Date deleteTime;
 
     @TableField("DELETE_MARK")
+    @TableLogic
     private String deleteMark;
 
     @TableField("ORGNIZE_ID")
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/controller/SupplierController.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/controller/SupplierController.java
index ca061f26..9558bcb7 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/controller/SupplierController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/controller/SupplierController.java
@@ -309,12 +309,12 @@ public class SupplierController {
     public ActionResult<SupplierInfoVO> info(@PathVariable("id") String id){
         SupplierEntity entity= supplierService.getInfo(id);
         SupplierInfoVO vo=JsonUtil.getJsonToBean(entity, SupplierInfoVO.class);
-        if(vo.getCreatorTime()!=null){
-            vo.setCreatorTime(vo.getCreatorTime());
-        }
-        if(vo.getLastModifyTime()!=null){
-            vo.setLastModifyTime(vo.getLastModifyTime());
-        }
+//        if(vo.getCreatorTime()!=null){
+//            vo.setCreatorTime(vo.getCreatorTime());
+//        }
+//        if(vo.getLastModifyTime()!=null){
+//            vo.setLastModifyTime(vo.getLastModifyTime());
+//        }
 
     //子表
     //副表
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java
index f99868ce..1782777a 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/entity/SupplierEntity.java
@@ -39,13 +39,13 @@ public class SupplierEntity  {
     @TableField(value = "LAST_MODIFY_TIME",fill = FieldFill.UPDATE)
     private Date lastModifyTime;
 
-    @TableField("DELETE_USER_ID")
+    @TableField(value = "DELETE_USER_ID",fill = FieldFill.UPDATE)
     private String deleteUserId;
 
-    @TableField("DELETE_USER_NAME")
+    @TableField(value = "DELETE_USER_NAME",fill = FieldFill.UPDATE)
     private String deleteUserName;
 
-    @TableField("DELETE_TIME")
+    @TableField(value = "DELETE_TIME",fill = FieldFill.UPDATE)
     private Date deleteTime;
 
     @TableField("DELETE_MARK")