From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/dto/MaterialInfoDto.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/MaterialInfoDto.java b/src/main/java/com/ruoyi/production/dto/MaterialInfoDto.java
index 070f7e4..21b0893 100644
--- a/src/main/java/com/ruoyi/production/dto/MaterialInfoDto.java
+++ b/src/main/java/com/ruoyi/production/dto/MaterialInfoDto.java
@@ -21,7 +21,11 @@
private String num;
private String numSuffix = "寮�";
private String unit;
- private String unitSuffix = "鍏�/kg";
+ private String unitSuffix = "kg";
private String price;
+ private String priceSuffix = "鍏�/kg";
private String totalAmount;
+ private String parentId;
+
+ private String productModelId;
}
--
Gitblit v1.9.3