11/1

src/main/java/cn/cslg/pas/domain/business/Product.java

@@ -2,6 +2,7 @@ package cn.cslg.pas.domain.business;
 
 import cn.cslg.pas.domain.BaseEntity;
 import cn.hutool.core.date.DateTime;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -31,7 +32,8 @@ public class Product extends BaseEntity<Product> {
     /**
      * 上市时间
      */
-    @TableField(value = "market_time")
+
+    @TableField(value = "market_time",updateStrategy= FieldStrategy.IGNORED)
     private Date marketTime;
 
     /**
@@ -49,7 +51,7 @@ public class Product extends BaseEntity<Product> {
     /**
      * 描述
      */
-    @TableField(value = "description")
+    @TableField(value = "description",updateStrategy= FieldStrategy.IGNORED)
     private String description;
 
     /**
@@ -62,7 +64,7 @@ public class Product extends BaseEntity<Product> {
      * 创建时间
      */
     @TableField(value = "create_time")
-    private DateTime createTime;
+    private Date createTime;
 
     /**
      * 租户id

src/main/java/cn/cslg/pas/domain/business/ProductCategory.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import org.joda.time.DateTime;
 
+import java.util.Date;
+
 /**
  * <p>
  * 产品类别实体类
@@ -46,7 +48,7 @@ public class ProductCategory extends BaseEntity<ProductCategory> {
      * 创建时间
      */
     @TableField(value = "create_time")
-    private DateTime createTime;
+    private Date createTime;
 
     /**
      * 所属租户

src/main/java/cn/cslg/pas/service/business/ProductService.java

@@ -22,6 +22,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -247,6 +248,9 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
             throw new XiaoShiException("名称重复");
         }
         BeanUtils.copyProperties(updateProductDTO, product);
+        if (updateProductDTO.getMarketTime() == null) {
+            product.setMarketTime(null);
+        }
         product.updateById();
         /**
          * 与产品有关的可见人员的处理