From f68d79d0ff6658795c19c2fd473fab9ff6f0640d Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/dto/ProductMaterialGroupDto.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductMaterialGroupDto.java b/src/main/java/com/ruoyi/production/dto/ProductMaterialGroupDto.java
index 8f2e98f..a72df83 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductMaterialGroupDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductMaterialGroupDto.java
@@ -26,5 +26,5 @@
private String configName;
@ApiModelProperty("鐗╂枡鍒楄〃")
- private List<ProductMaterial> materialList;
+ private List<ProductMaterialDto> materialList;
}
--
Gitblit v1.9.3