Merge branch 'dev' into dev-ty1.2

# Conflicts: # mhd_wms/src/main/resources/bootstrap.yml
2026-08-22 13:59:22 +08:00
parent 5fc491f612 072a4f7d1f
commit 1b3b1a6394
41 changed files with 471 additions and 134 deletions
@@ -244,4 +244,10 @@ public class MaterialBaseInfoFeign extends BaseVOEntity{

    @ApiModelProperty(name = "单位")
    private String unit;
+
+    @ApiModelProperty(name = "组织(多个用,分开)")
+    private String orgId;
+
+    @ApiModelProperty(name = "是否正常物料: 0-是 1-否")
+    private Integer isNormalMaterial;
 }