From ec03bfa81ac2000000eef30036e77298352bdc41 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 23 四月 2026 16:19:08 +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..f90cf81 100644
--- a/src/main/java/com/ruoyi/production/dto/MaterialInfoDto.java
+++ b/src/main/java/com/ruoyi/production/dto/MaterialInfoDto.java
@@ -1,10 +1,12 @@
package com.ruoyi.production.dto;
+import com.ruoyi.dto.SimplePersonDto;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
+import java.util.List;
/**
* @author buhuazhen
@@ -21,7 +23,8 @@
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;
}
--
Gitblit v1.9.3