From e0c8edd1d949fae5883a60019d02a9c5f7cb7a29 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 三月 2026 09:08:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/pojo/ProductMaterialSku.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductMaterialSku.java b/src/main/java/com/ruoyi/production/pojo/ProductMaterialSku.java
index e5c1c35..4678b5c 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductMaterialSku.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductMaterialSku.java
@@ -29,7 +29,7 @@
private Long id;
@ApiModelProperty("鐗╂枡ID")
- private Long materialId;
+ private Long productId;
@ApiModelProperty("鏍囪瘑缂栫爜")
private String identifierCode;
@@ -38,7 +38,7 @@
private String materialCode;
@ApiModelProperty("瑙勬牸鍨嬪彿")
- private String specification;
+ private String model;
@ApiModelProperty("渚涘簲鏂瑰紡锛堣嚜鍒讹紝澶栬喘锛�")
private String supplyType;
--
Gitblit v1.9.3