product-inventory-management-after.git

			@@ -21,12 +21,12 @@
			*/
			@Data
			@TableName("product_material")
			@ApiModel(value = "ProductMaterial", description = "产品物料信息表")
			@ApiModel(value = "ProductMaterial", description = "物料主表")
			public class ProductMaterial {

			@TableId(type = IdType.AUTO)
			@ApiModelProperty("主键ID")
			private Integer id;
			private Long id;

			@ApiModelProperty("租户ID")
			private Long tenantId;
			@@ -37,35 +37,11 @@
			@ApiModelProperty("存货类别ID")
			private Integer inventoryCategoryId;

			@ApiModelProperty("标识编码")
			private String identifierCode;

			@ApiModelProperty("物料代码")
			private String materialCode;

			@ApiModelProperty("产品名称")
			private String productName;

			@ApiModelProperty("物料品名")
			@ApiModelProperty("物料名称")
			private String materialName;

			@ApiModelProperty("规格型号")
			private String specification;

			@ApiModelProperty("基本单位")
			private String baseUnit;

			@ApiModelProperty("物料属性")
			private String materialAttribute;

			@ApiModelProperty("成品品名")
			private String finishedProductName;

			@ApiModelProperty("提交人姓名")
			private String originatorName;

			@ApiModelProperty("提交人组织")
			private String originatorOrg;

			@ApiModelProperty("备注")
			private String remark;
			@@ -77,11 +53,4 @@
			@ApiModelProperty("修改时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private LocalDateTime updateTime;

			@ApiModelProperty("宜搭表单实例ID")
			private String formInstanceId;

			@ApiModelProperty("宜搭修改时间")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private LocalDateTime formModifiedTime;
			}