Merge branch 'dev_lzh_wms_20260120' into wms_dev

This commit is contained in:
zhou-hongcheng
2026-01-29 14:46:31 +08:00
28 changed files with 1468 additions and 8 deletions
@@ -165,4 +165,7 @@ public class MaterialInventoryDO extends MaterialBaseDO {
@ApiModelProperty("面积")
@Excel(name = "面积")
private BigDecimal area;
@ApiModelProperty("货主id")
private Long shipperId;
}