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/ProductMaterial.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductMaterial.java b/src/main/java/com/ruoyi/production/pojo/ProductMaterial.java
index 55fb868..bfe4b08 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductMaterial.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductMaterial.java
@@ -38,10 +38,10 @@
private Integer inventoryCategoryId;
@ApiModelProperty("鐗╂枡鍚嶇О")
- private String materialName;
+ private String productName;
@ApiModelProperty("鍩烘湰鍗曚綅")
- private String baseUnit;
+ private String unit;
@ApiModelProperty("澶囨敞")
private String remark;
--
Gitblit v1.9.3