From f05fd2a067d751333f00a81dad095a7650900c95 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 13 三月 2026 13:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/pojo/ProductMaterial.java | 34 +++-------------------------------
1 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductMaterial.java b/src/main/java/com/ruoyi/production/pojo/ProductMaterial.java
index ee51416..55fb868 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductMaterial.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductMaterial.java
@@ -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,32 +37,11 @@
@ApiModelProperty("瀛樿揣绫诲埆ID")
private Integer inventoryCategoryId;
- @ApiModelProperty("鏍囪瘑缂栫爜")
- private String identifierCode;
-
- @ApiModelProperty("鐗╂枡浠ｇ爜")
- private String materialCode;
-
- @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;
@@ -74,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;
}
\ No newline at end of file
--
Gitblit v1.9.3