diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java index 44ff2f082..2d70d66e6 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java @@ -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; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java index 4a902da82..60f7a3d5d 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/entity/MaterialBaseInfo.java @@ -404,4 +404,9 @@ public class MaterialBaseInfo extends BaseVOEntity{ @ApiModelProperty(name = "收费标准") private BigDecimal chargeStandard; + @ApiModelProperty(name = "组织(多个用,分开)") + private String orgId; + + @ApiModelProperty(name = "是否正常物料: 0-是 1-否") + private Integer isNormalMaterial; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java index d7fb53ff9..b876cb1c2 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java @@ -393,4 +393,10 @@ public class MaterialBaseInfoPO extends BaseVOEntity{ @ApiModelProperty(name = "收费标准") private BigDecimal chargeStandard; + + @ApiModelProperty(name = "组织(多个用,分开)") + private String orgId; + + @ApiModelProperty(name = "是否正常物料: 0-是 1-否") + private Integer isNormalMaterial; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java index 3b3ae1181..d1e95243e 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java @@ -399,4 +399,10 @@ public class MaterialBaseInfoDO extends BaseVOEntity{ @ApiModelProperty(name = "收费标准") private BigDecimal chargeStandard; + + @ApiModelProperty(name = "组织(多个用,分开)") + private String orgId; + + @ApiModelProperty(name = "是否正常物料: 0-是 1-否") + private Integer isNormalMaterial; } \ No newline at end of file diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java index 54f093650..9ab26e7a9 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java @@ -379,4 +379,10 @@ public class MaterialBaseInfoDTO extends BaseVOEntity{ @ApiModelProperty(name = "收费标准") private BigDecimal chargeStandard; + @ApiModelProperty(name = "组织(多个用,分开)") + private String orgId; + + @ApiModelProperty(name = "是否正常物料: 0-是 1-否") + private Integer isNormalMaterial; + } \ No newline at end of file