修改一般贸易的详情查询数据来源

mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java

@@ -212,7 +212,7 @@ public class MaterialInfoApplicationService {
                         record.setGrossWeight(material.getGrossWeight());
                         record.setPushTime(now);
                         record.setDelFlag(1);
-                        record.setCreateBy(pushBy);
+                        record.setCreateBy(String.valueOf(pushBy));
                         record.setCreateTime(now);
                         record.setUpdateTime(now);
                         materialPushRecordMapper.insert(record);

mhd_oms/src/main/java/com/mhd/oms/domain/materialPushRecord/entity/MaterialPushRecord.java

@@ -1,14 +1,13 @@
 package com.mhd.oms.domain.materialPushRecord.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.mhd.common.core.web.domain.BaseVOEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -18,7 +17,7 @@ import java.util.Date;
 @Data
 @ApiModel(value = "物料推送记录对象")
 @TableName("material_push_record")
-public class MaterialPushRecord extends BaseVOEntity {
+public class MaterialPushRecord implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("主键")
@@ -64,9 +63,15 @@ public class MaterialPushRecord extends BaseVOEntity {
     @ApiModelProperty("删除标志(1-正常，2-删除)")
     private Integer delFlag;
 
-    @TableField(exist = false)
+    @ApiModelProperty("创建人")
-    private String createByName;
+    private String createBy;
 
-    @TableField(exist = false)
+    @ApiModelProperty("创建时间")
-    private String updateByName;
+    private Date createTime;
+
+    @ApiModelProperty("更新人")
+    private String updateBy;
+
+    @ApiModelProperty("更新时间")
+    private Date updateTime;
 }