Merge remote-tracking branch 'origin/dev' into dev

mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java

@@ -223,4 +223,24 @@ public class MaterialBaseInfoPO extends BaseVOEntity {
     @ApiModelProperty("规格型号")
     private String specificationModel;
 
+    @ApiModelProperty("批次ID")
+    @Excel(name = "批次ID")
+    private Long batchId;
+
+    @ApiModelProperty("批次编码")
+    @Excel(name = "批次编码")
+    private String batchCode;
+
+    @ApiModelProperty("批次名称")
+    @Excel(name = "批次名称")
+    private String batchName;
+
+    @ApiModelProperty("库存预警数量")
+    @Excel(name = "库存预警数量")
+    private Integer inventoryWarningCount;
+
+    @ApiModelProperty("临期预警数量")
+    @Excel(name = "临期预警数量")
+    private Integer expirationWarningCount;
+
 }

mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java

@@ -214,4 +214,7 @@ public class MaterialBaseInfoDO extends BaseVOEntity {
 
     @ApiModelProperty("规格型号")
     private String specificationModel;
+
+    @ApiModelProperty("批次ID")
+    private Long batchId;
 }