Merge remote-tracking branch 'origin/dev-ty1.2' into dev-ty1.2

2026-08-22 14:10:07 +08:00
parent a08d8a7fd5 1b3b1a6394
commit 2a4e39f755
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;
 }