From e45f6b4649edf03df3973a7dbe76b53b7e57a366 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 三月 2026 14:34:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/dto/ProductMaterialSkuDto.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductMaterialSkuDto.java b/src/main/java/com/ruoyi/production/dto/ProductMaterialSkuDto.java
index 749e53b..5ec77e5 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductMaterialSkuDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductMaterialSkuDto.java
@@ -18,19 +18,22 @@
public class ProductMaterialSkuDto {
@ApiModelProperty("鐗╂枡ID")
- private Long materialId;
+ private Long productId;
@ApiModelProperty("鐗╂枡鍚嶇О")
- private String materialName;
+ private String productName;
+
+ @ApiModelProperty("鐗╂枡缂栫爜")
+ private String materialCode;
@ApiModelProperty("鍗曚綅")
- private String baseUnit;
+ private String unit;
@ApiModelProperty("瑙勬牸ID")
- private Long skuId;
+ private Long id;
@ApiModelProperty("瑙勬牸鍨嬪彿")
- private String specification;
+ private String model;
@ApiModelProperty("渚涘簲鏂瑰紡")
private String supplyType;
--
Gitblit v1.9.3