Merge branch 'dev_qinhongzhanWMS' into wms_dev

mhd_wms/src/main/java/com/mhd/wms/domain/receiptMaterialDetail/entity/ReceiptMaterialDetail.java

@@ -1,6 +1,7 @@
 package com.mhd.wms.domain.receiptMaterialDetail.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -248,38 +249,47 @@ public class ReceiptMaterialDetail extends BaseVOEntity {
 
     @ApiModelProperty("申报数量")
     @Excel(name = "申报数量")
+    @TableField(exist = false)
     private BigDecimal declaredQuantity;
 
     @ApiModelProperty("申报单位")
     @Excel(name = "申报单位")
+    @TableField(exist = false)
     private String declarationUnit;
 
     @ApiModelProperty("原产国")
     @Excel(name = "原产国")
+    @TableField(exist = false)
     private String originCountry;
 
     @ApiModelProperty("币制")
     @Excel(name = "币制")
+    @TableField(exist = false)
     private String currency;
 
     @ApiModelProperty("单位")
     @Excel(name = "单位")
+    @TableField(exist = false)
     private String unit;
 
     @ApiModelProperty("升")
     @Excel(name = "升")
+    @TableField(exist = false)
     private BigDecimal liter;
 
     @ApiModelProperty("尺寸")
     @Excel(name = "尺寸")
+    @TableField(exist = false)
     private String dimensions;
 
     @ApiModelProperty("箱数")
     @Excel(name = "箱数")
+    @TableField(exist = false)
     private BigDecimal boxCount;
 
     @ApiModelProperty("件数")
     @Excel(name = "件数")
+    @TableField(exist = false)
     private BigDecimal pieceCount;