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/ProductMaterialDto.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductMaterialDto.java b/src/main/java/com/ruoyi/production/dto/ProductMaterialDto.java
index 7fc9a8b..7b3e6bd 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductMaterialDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductMaterialDto.java
@@ -33,7 +33,7 @@
private Integer inventoryCategoryId;
@ApiModelProperty("鐗╂枡鍚嶇О")
- private String materialName;
+ private String productName;
}
\ No newline at end of file
--
Gitblit v1.9.3