From 27a5635a83e4c524c64c7a409732a1d35e01cb8d Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 25 四月 2026 14:24:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/java/com/ruoyi/production/dto/MaterialInfoDto.java | 5 ++++-
1 files changed, 4 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..ef412d7 100644
--- a/src/main/java/com/ruoyi/production/dto/MaterialInfoDto.java
+++ b/src/main/java/com/ruoyi/production/dto/MaterialInfoDto.java
@@ -21,7 +21,10 @@
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 productModelId;
}
--
Gitblit v1.9.3